From 912a825d1e9c41d596e43d7440667a1882a0cb6d Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 27 Jun 2013 14:08:42 +0100 Subject: [PATCH 001/760] Disable exec symlink resolution for PostgreSQL 9.2 When building PostgreSQL with plugins under NixOS, NixOS will create a postgresql-and-plugins directory which symlinks PostgreSQL and all the plugins into a single directory. Unfortunately, the plugins will not actually be usable by PostgreSQL because it will still try and locate them in the original PostgreSQL share directory, not postgresql-and-plugins. In this commit, I have patched resolve_symlinks to always return success, which matches the behavior if HAVE_READLINK is false (so presumably invalid paths are never passed to this function). --- pkgs/servers/sql/postgresql/9.2.x.nix | 2 ++ .../sql/postgresql/disable-resolve_symlinks.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 46a6aa0c032c..ada8ee7a4f3e 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; + patches = [ ./disable-resolve_symlinks.patch ]; + installTargets = [ "install-world" ]; LC_ALL = "C"; diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch new file mode 100644 index 000000000000..3e6fd5e838a2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch @@ -0,0 +1,14 @@ +diff --git a/src/port/exec.c b/src/port/exec.c +index c79e8ba..42c4091 100644 +--- a/src/port/exec.c ++++ b/src/port/exec.c +@@ -216,6 +216,9 @@ find_my_exec(const char *argv0, char *retpath) + static int + resolve_symlinks(char *path) + { ++ // On NixOS we *want* stuff relative to symlinks. ++ return 0; ++ + #ifdef HAVE_READLINK + struct stat buf; + char orig_wd[MAXPGPATH], From 36e31d5aadf75a958dc5c57f98879d6698cd6b4b Mon Sep 17 00:00:00 2001 From: bbenoist Date: Mon, 30 Sep 2013 15:00:41 +0200 Subject: [PATCH 002/760] qtcreator: Update to 2.8.1 --- pkgs/development/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 55e33c45ca95..6cfe5efbe815 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -2,7 +2,7 @@ let baseVersion = "2.8"; - revision = "0"; + revision = "1"; version = "${baseVersion}.${revision}"; qt4_for_qtcreator = qt48.override { developerBuild = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; - sha256 = "7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2"; + sha256 = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"; }; buildInputs = [ qt4_for_qtcreator ]; From c7429711b8cd54a9eaa11649cdd17a3011efc3b3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 20 Oct 2013 22:52:02 +0200 Subject: [PATCH 003/760] nixos/nginx: allow to specify which package to use This enables to override which plugins to include with nginx by allowing to change nginx package. I also removed webdav option in nginx nixos module, because you can now specify this by overriding nginx package. --- .../modules/services/web-servers/nginx/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b26af1aa7445..4a1b6de2873f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -4,7 +4,7 @@ with pkgs.lib; let cfg = config.services.nginx; - nginx = pkgs.nginx.override { fullWebDAV = cfg.fullWebDAV; }; + nginx = cfg.package; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; daemon off; @@ -22,6 +22,13 @@ in "; }; + package = mkOption { + default = pkgs.nginx; + description = " + Nginx package to use. + "; + }; + config = mkOption { default = "events {}"; description = " @@ -46,10 +53,6 @@ in description = "Group account under which nginx runs."; }; - fullWebDAV = mkOption { - default = false; - description = "Compile in a third party module providing full WebDAV support"; - }; }; }; From 45851fc39abb0172c8c16b66913e22344da8c3fb Mon Sep 17 00:00:00 2001 From: bbenoist Date: Mon, 30 Sep 2013 15:15:25 +0200 Subject: [PATCH 004/760] qtcreator: Make the qt package optional and introduce the QtSDK To give the ability to use a different Qt version than the default one (which can build 3 different times Qt Libraries if we mixed the default one, the qtcreator one and the version including all the examples and the docs). Right now a developer can choose to directly install the QtSDK which includes a "full" (developerBuild + docs + examples) Qt version and uses it to build QtCreator. The possibility to only install QtCreator and its previous behavior has been kept for flexibility purposes (we do not need to force someone on the SDK approach). --- .../libraries/qt-4.x/4.8/default.nix | 3 +++ pkgs/development/qtcreator/default.nix | 27 ++++++++++++------- pkgs/top-level/all-packages.nix | 12 +++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 59151d35326d..72e08d608d11 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { sha256 = "0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb"; }; + # The version property must be kept because it will be included into the QtSDK package name + version = vers; + prePatch = '' substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 6cfe5efbe815..b12f81db9c4c 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,30 +1,39 @@ -{ stdenv, fetchurl, qt48 }: +{ stdenv, fetchurl, qtLib, sdkBuild ? false }: + +with stdenv.lib; let baseVersion = "2.8"; revision = "1"; version = "${baseVersion}.${revision}"; - qt4_for_qtcreator = qt48.override { - developerBuild = true; - }; in stdenv.mkDerivation rec { - name = "qtcreator-${version}"; + # The package name depends on wether we are just building the QtCreator package or the whole Qt SDK + # If we are building the QtCreator package: qtcreator-version + # If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version + name = "qt${if sdkBuild then "sdk" else "creator"}-${version}" + + optionalString sdkBuild "-qt-${qtLib.version}"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; sha256 = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"; }; - buildInputs = [ qt4_for_qtcreator ]; + # This property can be used in a nix development environment to refer to the Qt package + # eg: export QTDIR=${qtSDK.qt} + qt = qtLib; + + # We must only propagate Qt (including qmake) when building the QtSDK + propagatedBuildInputs = if sdkBuild then [ qtLib ] else []; + buildInputs = if sdkBuild == false then [ qtLib ] else []; doCheck = false; enableParallelBuilding = true; preConfigure = '' - qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qt4_for_qtcreator}/include" qtcreator.pro + qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro ''; installFlags = "INSTALL_ROOT=$(out)"; @@ -38,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.bbenoist ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ce6f7efe67..7a6f6d40a88d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5438,6 +5438,16 @@ let docs = true; demos = true; examples = true; + developerBuild = true; + }; + + qt4SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt48Full; + }; + + qtcreator = callPackage ../development/qtcreator { + qtLib = qt48.override { developerBuild = true; }; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -8511,8 +8521,6 @@ let qsynth = callPackage ../applications/audio/qsynth { }; - qtcreator = callPackage ../development/qtcreator { }; - qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; From 4edbaf9aa1e30cc2ebfb5f8c58b1b367c56ef7cf Mon Sep 17 00:00:00 2001 From: bbenoist Date: Mon, 30 Sep 2013 15:38:26 +0200 Subject: [PATCH 005/760] mesa: Minor fix on GL/gl.h Apply a fix which prevented to use -DGL_GLEXT_LEGACY, -Werror and -Wundef to be used together. This produced a build fail on any software meeting these requirements. --- pkgs/development/libraries/mesa/default.nix | 1 + pkgs/development/libraries/mesa/werror-wundef.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4fa5ee9e74ae..483ea5a1fe44 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation { ./static-gallium.patch ./dricore-gallium.patch ./fix-rounding.patch + ./werror-wundef.patch ]; # Change the search path for EGL drivers from $drivers/* to driverLink diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch new file mode 100644 index 000000000000..4663f68bd7d3 --- /dev/null +++ b/pkgs/development/libraries/mesa/werror-wundef.patch @@ -0,0 +1,12 @@ +diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h +--- Mesa-9.2.0-orig/include/GL/gl.h 2013-08-14 03:34:42.000000000 +0200 ++++ Mesa-9.2.0/include/GL/gl.h 2013-09-24 19:34:58.319140812 +0200 +@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO + + + +-#if GL_ARB_shader_objects ++#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects + + #ifndef GL_MESA_shader_debug + #define GL_MESA_shader_debug 1 From 90872e2b6cef90f3039b65367f85a9be68cab1e7 Mon Sep 17 00:00:00 2001 From: bbenoist Date: Wed, 16 Oct 2013 20:07:18 +0200 Subject: [PATCH 006/760] Add Qt 5.1.1 and its SDK Consider this as a first step towards the integration of Qt5 into nixpkgs, it does not yet intends to replace Qt4 on every packages even if possible. My goal here is to have a first derivation in common between people who needs qt5 for development purposes. The derivation has been written from scratch but I took care to read at the version 4 to re-integrate some patches which are still compatible. However, I did not had enough time to test gtkStyle and flashplayerFix as I do not use any of them. Also, OSX users will have to do some extra work because I do not have any mac. Finally, as some configure flags have changed and in an hope to provide a clear package definition before it becomes mature, I voluntary added some flags which are default. Once every option will be mastered, we will just have to redo a pass on qt5 configure flags and remove the ones which are set by default. --- pkgs/development/libraries/qt-5/default.nix | 157 ++++++++++++++++++ .../qt-5/dlopen-absolute-paths.patch | 36 ++++ .../libraries/qt-5/dlopen-gtkstyle.patch | 36 ++++ .../qt-5/dlopen-webkit-nsplugin.patch | 36 ++++ .../libraries/qt-5/glib-2.32.patch | 12 ++ pkgs/top-level/all-packages.nix | 19 +++ 6 files changed, 296 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/default.nix create mode 100644 pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch create mode 100644 pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch create mode 100644 pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch create mode 100644 pkgs/development/libraries/qt-5/glib-2.32.patch diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix new file mode 100644 index 000000000000..e593200d1599 --- /dev/null +++ b/pkgs/development/libraries/qt-5/default.nix @@ -0,0 +1,157 @@ +{ stdenv, fetchurl, substituteAll, libXrender, libXext +, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng +, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi +, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, xcbutilkeysyms, xcbutilwm,udev, libxml2, libxslt, pcre, libxkbcommon +, alsaLib, gstreamer, gst_plugins_base +, pulseaudio, bison, flex, gperf, ruby, libwebp +, flashplayerFix ? false +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, buildDocs ? false +, buildExamples ? false +, buildTests ? true +, developerBuild ? false +}: + +with stdenv.lib; + +let + v_maj = "5.1"; + v_min = "1"; + ver = "${v_maj}.${v_min}"; +in + +stdenv.mkDerivation rec { + name = "qt-${ver}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qt/" + + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; + sha256 = "4c05742db52325e96b1d610a2388140dcc1e3d03d93faea2b2d3791015b186f6"; + }; + + # The version property must be kept because it will be included into the QtSDK package name + version = ver; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + ''; + + patches = + [ ./glib-2.32.patch + (substituteAll { + src = ./dlopen-absolute-paths.patch; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }) + ] ++ optional gtkStyle (substituteAll { + src = ./dlopen-gtkstyle.patch; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + }) + ++ optional flashplayerFix (substituteAll { + src = ./dlopen-webkit-nsplugin.patch; + inherit gtk gdk_pixbuf; + }); + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -force-debug-info + -no-separate-debug-info + -system-proxies + + -gui + -widgets + -opengl desktop + -javascript-jit + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${optionalString (buildExamples == false) "no"}make examples + -${optionalString (buildTests == false) "no"}make tests + ''; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + libwebp alsaLib gstreamer gst_plugins_base pulseaudio + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ optionals mesaSupported [ mesa mesa_glu ] + ++ optional (cups != null) cups + ++ optional (mysql != null) mysql + ++ optional (postgresql != null) postgresql; + + buildInputs = [ gdb bison flex gperf ruby ]; + + nativeBuildInputs = [ python perl pkgconfig ]; + + postInstall = if buildDocs then "make docs&&make install_docs" else ""; + + enableParallelBuilding = true; + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = [ maintainers.bbenoist ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch new file mode 100644 index 000000000000..65b817a2b141 --- /dev/null +++ b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch @@ -0,0 +1,36 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 +@@ -93,7 +93,7 @@ + static void resolveLibrary() + { + #if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX) +- QLibrary lib(QLatin1String("resolv")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 +@@ -379,7 +379,7 @@ + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/printsupport/kernel/qcups.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/printsupport/kernel/qcups.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/printsupport/kernel/qcups.cpp 2013-08-25 20:03:36.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/printsupport/kernel/qcups.cpp 2013-09-25 17:40:35.895942599 +0200 +@@ -91,7 +91,7 @@ + + static void resolveCups() + { +- QLibrary cupsLib(QLatin1String("cups"), 2); ++ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); + if(cupsLib.load()) { + _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); + _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); diff --git a/pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch new file mode 100644 index 000000000000..05ff30b7ac33 --- /dev/null +++ b/pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch @@ -0,0 +1,36 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp 2013-08-25 20:03:30.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp 2013-09-25 17:58:04.229373681 +0200 +@@ -348,7 +348,7 @@ + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -461,8 +461,8 @@ + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -630,9 +630,9 @@ + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } diff --git a/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch new file mode 100644 index 000000000000..7cd90551454f --- /dev/null +++ b/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch @@ -0,0 +1,36 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-08-25 20:04:47.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-09-25 17:59:45.925363807 +0200 +@@ -132,7 +132,7 @@ + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp 2013-08-25 20:04:47.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp 2013-09-25 18:00:29.551215155 +0200 +@@ -702,7 +702,7 @@ + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2013-08-25 20:04:42.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2013-09-25 18:04:54.955408293 +0200 +@@ -64,7 +64,7 @@ + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + diff --git a/pkgs/development/libraries/qt-5/glib-2.32.patch b/pkgs/development/libraries/qt-5/glib-2.32.patch new file mode 100644 index 000000000000..eb71e79d1472 --- /dev/null +++ b/pkgs/development/libraries/qt-5/glib-2.32.patch @@ -0,0 +1,12 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-5.1.1/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +--- qt-everywhere-opensource-src-5.1.1-orig/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2013-08-25 20:04:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2013-09-25 18:09:22.154639482 +0200 +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a6f6d40a88d..f98604fdc87f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5446,6 +5446,25 @@ let qtLib = qt48Full; }; + qt5 = callPackage ../development/libraries/qt-5 { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + }; + + qt5Full = qt5.override { + buildDocs = true; + buildExamples = true; + buildTests = true; + developerBuild = true; + }; + + qt5SDK = qtcreator.override { + sdkBuild = true; + qtLib = qt5Full; + }; + qtcreator = callPackage ../development/qtcreator { qtLib = qt48.override { developerBuild = true; }; }; From 736b295bc56199280bbe35c9822a7c473c44f909 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Mon, 28 Oct 2013 09:56:19 +0100 Subject: [PATCH 007/760] vtk: Use the Qt libraries as an argument instead of a boolean To prevent multiple Qt libraries when developing with a custom one, the Qt support can now be activated by directly supplying the Qt libraries as an argument (qtLib). qtSDK and qtFull users/developers now just have to define an override such as the following one in order to use it inside their development environment: vtk.override { qtLib = qt4SDK; }; The previous behavior is still the same for vtk and vtkWithQt4 end-users. Change-Id: I517762d4ff7de46d32cc46e6e725fd62737caa52 --- pkgs/development/libraries/vtk/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index e8f42e9f7f5f..0e0625a2cbbe 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt -, useQt4 ? false, qt4 }: +, qtLib ? null }: with stdenv.lib; @@ -11,22 +11,22 @@ let in stdenv.mkDerivation rec { - name = "vtk-${os useQt4 "qvtk-"}${version}"; + name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; md5 = "a0363f78910f466ba8f1bd5ab5437cb9"; }; buildInputs = [ cmake mesa libX11 xproto libXt ] - ++ optional useQt4 qt4; + ++ optional (qtLib != null) qtLib; # Shared libraries don't work, because of rpath troubles with the current # nixpkgs camke approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional useQt4 - [ "-DVTK_USE_QT:BOOL=ON" ]; + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] + ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f98604fdc87f..13b6dff2432b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5731,7 +5731,7 @@ let vtk = callPackage ../development/libraries/vtk { }; - vtkWithQt4 = vtk.override { useQt4 = true; }; + vtkWithQt4 = vtk.override { qtLib = qt4; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; From 808962fe31b2a144274e2bf0eeb2bee0eb538c82 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Tue, 29 Oct 2013 17:14:53 +0100 Subject: [PATCH 008/760] Attempt at compiling MilkyTracker, but recent zlib version may have broken it. There's a zlib version included with milkytracker, but there's no makefiles for it. I've only included the header here, but it fails at link-time with several 'undefined reference' errors, which simply means it can't find the definitions, e.g. compiled zlib. There's bug reports on other package systems although unfortunately still unresolved. https://bugs.archlinux.org/task/31324 http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html --- .../audio/milkytracker/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/audio/milkytracker/default.nix diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix new file mode 100644 index 000000000000..c0ce0058ba42 --- /dev/null +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, perl}: + +stdenv.mkDerivation rec { + version = "0.90.85"; + name = "milkytracker-${version}"; + + src = fetchurl { + url = "http://milkytracker.org/files/milkytracker-0.90.85.tar.gz"; + sha256 = "184pk0k9nv461a61sh6lb62wfadjwwk8ri3z5kpdbqnyssz0zfpv"; + }; + + # Get two official patches. + no_zzip_patch = fetchurl { + url = "http://www.milkytracker.org/files/patches-0.90.85/no_zziplib_dep.patch"; + sha256 = "1w550q7pxa7w6v2v19ljk03hayacrs6y887izg11a1983wk7qzb3"; + }; + + fix_64bit_patch = fetchurl { + url = "http://www.milkytracker.org/files/patches-0.90.85/64bit_freebsd_fix.patch"; + sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6"; + }; + + preConfigure = '' + patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} + patch < ${no_zzip_patch} + ''; + + # There's a zlib version included with milkytracker, + # but there's no makefiles for it. I've only included + # the header here, but it fails at link-time with + # several 'undefined reference' errors, which simply + # means it can't find the definitions, e.g. compiled + # zlib. + # There's bug reports on other package systems although + # unfortunately still unresolved. + # https://bugs.archlinux.org/task/31324 + # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html + preBuild='' + export CPATH="`pwd`/src/compression/zlib/generic" + ''; + + buildInputs = [ alsaLib SDL automake autoconf perl]; + + meta = { + description = "Music tracker application, similar to Fasttracker II."; + homepage = http://milkytracker.org; + license = "GPLv3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f03e3482bb0..3b6f55ffd0cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7358,6 +7358,8 @@ let audacity = callPackage ../applications/audio/audacity { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; From 39525c52d8540a2e4103e09a7fde4553cec9be25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 30 Oct 2013 00:00:46 +0100 Subject: [PATCH 009/760] MilkyTracker: fix build, use system zlib and decompressor patch Also add JACK support --- .../milkytracker/decompressor_gzip.patch | 20 ++++++++++++++++ .../audio/milkytracker/default.nix | 23 ++++++------------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/audio/milkytracker/decompressor_gzip.patch diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch new file mode 100644 index 000000000000..c64421116dea --- /dev/null +++ b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch @@ -0,0 +1,20 @@ +https://bugs.archlinux.org/task/31324 +https://410333.bugs.gentoo.org/attachment.cgi?id=322456 + +diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp +--- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 ++++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 +@@ -57,11 +57,11 @@ + + bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) + { +- gzFile *gz_input_file = NULL; ++ gzFile gz_input_file = NULL; + int len = 0; + pp_uint8 *buf; + +- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) ++ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) + return false; + + if ((buf = new pp_uint8[0x10000]) == NULL) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index c0ce0058ba42..3a464fb9fdb9 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, perl}: +{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, jackaudio, perl, zlib, zziplib }: stdenv.mkDerivation rec { version = "0.90.85"; @@ -20,26 +20,17 @@ stdenv.mkDerivation rec { sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6"; }; - preConfigure = '' - patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} - patch < ${no_zzip_patch} + patchPhase = '' + patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} + patch < ${no_zzip_patch} + patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch} ''; - # There's a zlib version included with milkytracker, - # but there's no makefiles for it. I've only included - # the header here, but it fails at link-time with - # several 'undefined reference' errors, which simply - # means it can't find the definitions, e.g. compiled - # zlib. - # There's bug reports on other package systems although - # unfortunately still unresolved. - # https://bugs.archlinux.org/task/31324 - # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html preBuild='' - export CPATH="`pwd`/src/compression/zlib/generic" + export CPATH=${zlib}/lib ''; - buildInputs = [ alsaLib SDL automake autoconf perl]; + buildInputs = [ alsaLib SDL automake autoconf jackaudio perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; From 9f6f87f76aed81c5d51a87d6934755d5dc4816a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 30 Oct 2013 00:07:18 +0100 Subject: [PATCH 010/760] MilkyTracker: Tidy up, sort buildInputs and use the attrPath for the license --- pkgs/applications/audio/milkytracker/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 3a464fb9fdb9..8cbf85306b66 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, jackaudio, perl, zlib, zziplib }: +{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl +, zlib, zziplib +}: stdenv.mkDerivation rec { version = "0.90.85"; @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { export CPATH=${zlib}/lib ''; - buildInputs = [ alsaLib SDL automake autoconf jackaudio perl zlib zziplib ]; + buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; homepage = http://milkytracker.org; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3Plus; }; } From 6fda96ba105d0d128ea122f2a400e831d484c2eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Oct 2013 15:17:37 +0200 Subject: [PATCH 011/760] Set the channel for this release --- nixos/modules/misc/version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2fa95563e9ab..4b0a2d2f947f 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -33,7 +33,7 @@ with pkgs.lib; system.defaultChannel = mkOption { internal = true; type = types.str; - default = https://nixos.org/channels/nixos-unstable; + default = https://nixos.org/channels/nixos-13.10; description = "Default NixOS channel to which the root user is subscribed."; }; From 561f56bd2a0508ac086b92305829dcb8f00a1dd9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 1 Nov 2013 09:16:36 +0100 Subject: [PATCH 012/760] Next release will be 14.02 Baboon --- .version | 2 +- nixos/modules/misc/version.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 381796ec8b7e..07167f90842e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -13.10 \ No newline at end of file +14.02 \ No newline at end of file diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2fa95563e9ab..ae9fb5fb2a0e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -53,7 +53,7 @@ with pkgs.lib; mkDefault (if pathExists fn then readFile fn else "master"); # Note: code names must only increase in alphabetical order. - system.nixosCodeName = "Aardvark"; + system.nixosCodeName = "Baboon"; # Generate /etc/os-release. See # http://0pointer.de/public/systemd-man/os-release.html for the From cd1605f729a651a03bb27f9d443c04c04a016150 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:53:44 +0100 Subject: [PATCH 013/760] maxima: update to version 5.31.3 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index b8f7f2e65b66..2c85a1c97d17 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.31.2"; + version = "5.31.3"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "12j5irwfckl5583h7lwh0wrp0c65q7mqzcsri2v086j50xvvv398"; + sha256 = "1g959569plywqaxxp488ylblgkirqg24arwa93dplfxi4h7fc4km"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From 40a31df497ecaf4617f34c2046a345a03f95cd86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:57 +0100 Subject: [PATCH 014/760] haskell-Elm: update to version 0.10.0.2 --- pkgs/development/compilers/elm/elm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index c9e9fb9e14b5..6fc65bf368b3 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Elm"; - version = "0.10.0.1"; - sha256 = "1r7z2fw9v6ngr9w4lmj1l6sc78rmxvqkqlxv4a9yc5jm80k3ar0i"; + version = "0.10.0.2"; + sha256 = "08aqz9lf754ygdwvjf4bs5ivnjyjx9rd43vrbzp0p4d3if6w6avz"; isLibrary = true; isExecutable = true; buildDepends = [ From 03e7ab54a0038e30dd8992bed0556fad8e82a72a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:57 +0100 Subject: [PATCH 015/760] haskell-fclabels: update to version 2.0.0.5 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 162b83733b13..67276b77c1dd 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "2.0.0.2"; - sha256 = "1c706v10g4av7jxiw3x4n1hg9h7sbwcnrj676b1q0rcb3pd32kz6"; + version = "2.0.0.5"; + sha256 = "1xg0bvk6m981v05j3jp35hyclfilnic1q83kla8zlbnmdpqljqdb"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; From 15851f0661f472bc5661be593cac85c062c5aee5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:57 +0100 Subject: [PATCH 016/760] haskell-free: update to version 4.2 --- pkgs/development/libraries/haskell/free/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 64d9541f4019..a481d4519734 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.1"; - sha256 = "16951r4f7ggvcw2qgjwdrmaxxnrmrm69c67nixs77lm1d31nks4w"; + version = "4.2"; + sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb"; buildDepends = [ bifunctors comonad distributive mtl profunctors semigroupoids semigroups transformers From 6e180df18cad336d6d4fbe8d11b371cb97951b10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:57 +0100 Subject: [PATCH 017/760] haskell-intervals: update to version 0.4 --- pkgs/development/libraries/haskell/intervals/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 788962412d7a..5623b73527c7 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -1,9 +1,11 @@ -{ cabal }: +{ cabal, distributive, doctest, filepath }: cabal.mkDerivation (self: { pname = "intervals"; - version = "0.3"; - sha256 = "1k8dhhwa6y5hrkm9np9x953bdn3pgk5c2lkl3zgrrmrwmd075422"; + version = "0.4"; + sha256 = "0w33arfv1hd3a3l4rvn67nh5q6w05jj6hjlbjmbmrjyhwg35jnac"; + buildDepends = [ distributive ]; + testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; From a4cfdfad5de2680b2f7cc77c10526c52c500aac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:58 +0100 Subject: [PATCH 018/760] haskell-terminfo: update to version 0.3.2.6 --- pkgs/development/libraries/haskell/terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 24221912025a..f772de7c8a1d 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.5"; - sha256 = "1hadb1gv28c43xq78scalb4zzvbs6im2s0hq7ycrbsdgm6iryhbg"; + version = "0.3.2.6"; + sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f"; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; From dda0d13d22fcfe6bf759b978324550abdb95e185 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:58 +0100 Subject: [PATCH 019/760] haskell-text-icu: update to version 0.6.3.7 --- .../libraries/haskell/text-icu/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix index 16115809f5b1..6dc42beee408 100644 --- a/pkgs/development/libraries/haskell/text-icu/default.nix +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -1,13 +1,19 @@ -{ cabal, icu, text }: +{ cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "text-icu"; - version = "0.6.3.5"; - sha256 = "1blfw9377yl732ypbjhkvi3vfg6c1f1rkxcsvwmqyhkdzb2agg0a"; + version = "0.6.3.7"; + sha256 = "0mzzjamcxfrld9xwgdww3890zzkgmi1qb83v5z9zrixmdgwkvhf4"; buildDepends = [ text ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; extraLibraries = [ icu ]; meta = { - homepage = "https://bitbucket.org/bos/text-icu"; + homepage = "https://github.com/bos/text-icu"; description = "Bindings to the ICU library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2de6d7169428a4f60a49c6df7fca6666aa5eef23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:58 +0100 Subject: [PATCH 020/760] haskell-trifecta: update to version 1.1 --- pkgs/development/libraries/haskell/trifecta/1.1.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index ac6cfdd43ae1..bf5f2f0d0a70 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -18,8 +18,7 @@ cabal.mkDerivation (self: { substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; From 5fd1c46beba36a616b688b6f114e25a62c1f4627 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:58 +0100 Subject: [PATCH 021/760] haskell-trifecta: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/trifecta/1.2.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index de876fa7f67a..f7b9a7aea811 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -18,8 +18,7 @@ cabal.mkDerivation (self: { substituteInPlace trifecta.cabal \ --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; From 8352df8d66a7fa3f5abc4ab890fbbfe34f335f79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:28:58 +0100 Subject: [PATCH 022/760] haskell-yesod-platform: update to version 1.2.4.4 --- pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index f75b5706f6aa..7d56ca1142cd 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -30,8 +30,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.4.3"; - sha256 = "1ilkfmg4sdrz45hc2m8b8rqz242phgxzgizrnd41d5g04jib3hl3"; + version = "1.2.4.4"; + sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder From 4ba7dfde5b79ec835e8739922400b3f5f4f089f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Nov 2013 14:45:56 +0100 Subject: [PATCH 023/760] Don't set an initial null root password for Amazon / VirtualBox images A null password allows logging into local PAM services such as "login" (agetty) and KDM. That's not actually a security problem for EC2 machines, since they do not have "local" logins; for VirtualBox machines, if you local access, you can do anything anyway. But it's better to be on the safe side and disable password-based logins for root. --- nixos/modules/config/users-groups.nix | 16 +++++++++++++++- nixos/modules/virtualisation/amazon-image.nix | 5 +++++ .../modules/virtualisation/virtualbox-image.nix | 5 +++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index fb8b0229c1da..79570fc25713 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -188,6 +188,20 @@ in options = [ groupOpts ]; }; + security.initialRootPassword = mkOption { + type = types.str; + default = ""; + example = "!"; + description = '' + The (hashed) password for the root account set on initial + installation. The empty string denotes that root can login + locally without a password (but not via remote services such + as SSH, or indirectly via su or + sudo). The string ! + prevents root from logging in using a password. + ''; + }; + }; @@ -240,7 +254,7 @@ in # Can't use useradd, since it complains that it doesn't know us # (bootstrap problem!). echo "root:x:0:0:System administrator:$rootHome:${config.users.defaultUserShell}" >> /etc/passwd - echo "root::::::::" >> /etc/shadow + echo "root:${config.security.initialRootPassword}:::::::" >> /etc/shadow fi ''; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index cfc582170e6c..abd2a1084bd9 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -160,4 +160,9 @@ with pkgs.lib; environment.systemPackages = [ pkgs.cryptsetup ]; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; + + # Prevent logging in as root without a password. This doesn't really matter, + # since the only PAM services that allow logging in with a null + # password are local ones that are inaccessible on EC2 machines. + security.initialRootPassword = "!"; } diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index beed36b6a516..71bdf31a98d2 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -107,4 +107,9 @@ with pkgs.lib; boot.loader.grub.device = "/dev/sda"; services.virtualbox.enable = true; + + # Prevent logging in as root without a password. For NixOps, we + # don't need this because the user can login via SSH, and for the + # demo images, there is a demo user account that can sudo to root. + security.initialRootPassword = "!"; } From 20093751ec96b43d87f0850fc3ad541237405564 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Nov 2013 14:50:24 +0100 Subject: [PATCH 024/760] Print a reminder to users to set or disable the root password --- nixos/modules/config/users-groups.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 79570fc25713..714de646eb7a 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -258,6 +258,22 @@ in fi ''; + # Print a reminder for users to set a root password. + environment.interactiveShellInit = + '' + if [ "$UID" = 0 ]; then + read _l < /etc/shadow + if [ "''${_l:0:6}" = root:: ]; then + cat >&2 < Date: Fri, 1 Nov 2013 10:53:07 -0400 Subject: [PATCH 025/760] Remove EOL'd kernels Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 12 ----------- pkgs/os-specific/linux/kernel/linux-3.9.nix | 16 --------------- pkgs/os-specific/linux/kernel/patches.nix | 14 ------------- pkgs/top-level/all-packages.nix | 22 --------------------- 4 files changed, 64 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.0.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.9.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix deleted file mode 100644 index 30b70035dfac..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.0.99"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1p31gq9kzwfks980y6rb2mjyagj8lrh6y156a550v7mk0bd4fzdi"; - }; - - features.iwlwifi = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix deleted file mode 100644 index 51bcf35b3fe8..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.9.11"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 613f40c6fc96..6c812646209c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -68,20 +68,6 @@ rec { features.secPermPatch = true; }; - aufs3_0 = rec { - name = "aufs3.0"; - version = "3.0.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "0627c706d69778f5c74be982f28c746153b8cdf7"; - sha256 = "7008ff64f5adc2b3a30fcbb090bcbfaac61b778af38493b6144fc7d768a6514d"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39dbeae6df44..9749db65557f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6594,14 +6594,6 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_0 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = @@ -6669,18 +6661,6 @@ let inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; }; - linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = @@ -6827,7 +6807,6 @@ let }; # Build the kernel modules for the some of the kernels. - linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; linuxPackages_3_2_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity; @@ -6835,7 +6814,6 @@ let linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); From fc91ec48a8c6a0eba7c11ac6710d7e664f51b53c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Nov 2013 10:53:32 -0400 Subject: [PATCH 026/760] Update default kernel to 3.10 Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9749db65557f..d302685bc303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6822,7 +6822,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_4; + linuxPackages = linuxPackages_3_10; # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { From cd9786eed27f3ef5535605c483829fdf914c80a1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Nov 2013 11:29:36 -0400 Subject: [PATCH 027/760] Fold efi booting into the default livecd Signed-off-by: Shea Levy --- .../installer/cd-dvd/installation-cd-base.nix | 6 ++++++ .../installer/cd-dvd/installation-cd-efi.nix | 14 -------------- nixos/release.nix | 9 --------- nixos/tests/efi-installer.nix | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-efi.nix diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 999871ab074f..1aba67dcd9e9 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -32,6 +32,12 @@ with pkgs.lib; # in the Nix store on the CD. isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ]; + # EFI booting + isoImage.makeEfiBootable = true; + # Add Memtest86+ to the CD. boot.loader.grub.memtest86 = true; + + # Get a console as soon as the initrd loads fbcon on EFI boot + boot.initrd.kernelModules = [ "fbcon" ]; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix deleted file mode 100644 index 4aa788feeae5..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Move into base image once using 3.10 or later - - require = [ ./installation-cd-minimal.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_3_10; - - # Get a console as soon as the initrd loads fbcon on EFI boot - boot.initrd.kernelModules = [ "fbcon" ]; - - isoImage.makeEfiBootable = true; -} diff --git a/nixos/release.nix b/nixos/release.nix index 1ffb334d90a4..120b1289bd06 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -143,15 +143,6 @@ in rec { inherit system; }); - # A variant with efi booting support. Once cd-minimal has a newer kernel, - # this should be enabled by default. - iso_efi = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-efi.nix; - type = "efi"; - maintainers = [ "shlevy" ]; - inherit system; - }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forAllSystems (system: diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix index 8a05dbf2a610..63aa0289ffbe 100644 --- a/nixos/tests/efi-installer.nix +++ b/nixos/tests/efi-installer.nix @@ -12,7 +12,7 @@ let (import ../lib/eval-config.nix { inherit system; modules = - [ ../modules/installer/cd-dvd/installation-cd-efi.nix + [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix { key = "serial"; From dac108f51ba2eff7e5fdcc425879c53ee79ddd6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 16:33:54 +0100 Subject: [PATCH 028/760] ikiwiki: update to version 3.20130904 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index baf97e7a8247..b8bf0f38d104 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20130518"; + version = "3.20130904.1"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp"; + sha256 = "1nxycsz49y6801lbrvazzg7qc9q2vpr2ny1sba26f9gwc00c650h"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 9ef07d859b23840e1a5d7d7125a6982720afa391 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Nov 2013 16:44:03 +0100 Subject: [PATCH 029/760] Include the NixOS version in the manual In particular, this will make it clear what version of the manual is shown at http://nixos.org/nixos/manual/. --- nixos/doc/manual/default.nix | 5 ++--- nixos/doc/manual/manual.xml | 1 + nixos/modules/services/misc/nixos-manual.nix | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index db3245fcc07d..6d5039e81778 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -1,6 +1,4 @@ -{ pkgs, options -, revision ? "master" -}: +{ pkgs, options, version, revision }: with pkgs.lib; @@ -60,6 +58,7 @@ in rec { buildCommand = '' ln -s $sources/*.xml . # */ ln -s ${optionsDocBook} options-db.xml + echo "${version}" > version # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index dfbd865b505b..6e13281cbd94 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -5,6 +5,7 @@ NixOS Manual + Version diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 885b8fa2d0ca..1a8b85db3290 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -23,6 +23,7 @@ let manual = import ../../../doc/manual { inherit pkgs; + version = config.system.nixosVersion; revision = config.system.nixosRevision; options = eval.options; }; From 10e61f53d8d4cd9aa8eefa93ddd23c5428784720 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 12 Oct 2013 12:28:48 +0200 Subject: [PATCH 030/760] nixos/logstash: update and simplify to be fully compatible with new version --- nixos/modules/services/logging/logstash.nix | 143 +++----------------- 1 file changed, 22 insertions(+), 121 deletions(-) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 79bdf4f7bbca..373476c66999 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -3,72 +3,8 @@ with pkgs.lib; let - cfg = config.services.logstash; - listToConfig = list: "[ " + (concatStringsSep ", " (map exprToConfig list)) + " ]"; - - hashToConfig = attrs: - let - attrNameToConfigList = name: - [ (exprToConfig name) (exprToConfig (getAttr name attrs)) ]; - in - "[ " + - (concatStringsSep ", " (map attrNameToConfigList (attrNames attrs))) + - " ]"; - - valueToConfig = nvpair: let name = nvpair.name; value = nvpair.value; in - if (isAttrs value) && ((!(value ? __type)) || value.__type == "repeated") - then '' - ${name} { - ${exprToConfig value} - } - '' - else "${name} => ${exprToConfig value}"; - - repeatedAttrsToConfig = values: - concatStringsSep "\n" (map valueToConfig values); - - attrsToConfig = attrs: - let - attrToConfig = name: valueToConfig { - inherit name; - value = (getAttr name attrs); - }; - in - concatStringsSep "\n" (map attrToConfig (attrNames attrs)); - - exprToConfig = expr: - let - isCustomType = expr: (isAttrs expr) && (expr ? __type); - - isFloat = expr: (isCustomType expr) && (expr.__type == "float"); - - isHash = expr: (isCustomType expr) && (expr.__type == "hash"); - - isRepeatedAttrs = expr: (isCustomType expr) && (expr.__type == "repeated"); - in - if builtins.isBool expr then (if expr then "true" else "false") else - if builtins.isString expr then ''"${expr}"'' else - if builtins.isInt expr then toString expr else - if isFloat expr then expr.value else - if isList expr then listToConfig expr else - if isHash expr then hashToConfig expr.value else - if isRepeatedAttrs expr then repeatedAttrsToConfig expr.values - else attrsToConfig expr; - - mergeConfigs = configs: - let - op = attrs: newAttrs: - let - isRepeated = newAttrs ? __type && newAttrs.__type == "repeated"; - in { - values = attrs.values ++ (if isRepeated then newAttrs.values else - map (name: { inherit name; value = getAttr name newAttrs; }) - (attrNames newAttrs)); - }; - in (foldl op { values = []; } configs) // { __type = "repeated"; }; - in { @@ -78,48 +14,22 @@ in services.logstash = { enable = mkOption { default = false; - description = '' - Enable logstash. - ''; + description = "Enable logstash"; }; inputConfig = mkOption { - default = {}; - description = '' - An attribute set (or an expression generated by mkNameValuePairs) - representing a logstash configuration's input section. - Logstash configs are name-value pairs, where values can be bools, - strings, numbers, arrays, hashes, or other name-value pairs, - and names are strings that can be repeated. Name-value pairs with no - repeats are represented by attr sets. Bools, strings, ints, and - arrays are mapped directly. Name-value pairs with repeats can be - generated by the config.lib.logstash.mkNameValuePairs function, which - takes a list of attrsets and combines them while preserving attribute - name duplicates if they occur. Similarly, there are the mkFloat and - mkHash functions, which take a string representation of a float and an - attrset, respectively. - ''; - apply = mergeConfigs; + default = ''stdin { type => "example" }''; + description = "Logstash input configuration"; }; filterConfig = mkOption { - default = {}; - description = '' - An attribute set (or an expression generated by mkNameValuePairs) - representing a logstash configuration's filter section. - See inputConfig description for details. - ''; - apply = mergeConfigs; + default = ''noop {}''; + description = "logstash filter configuration"; }; outputConfig = mkOption { - default = {}; - description = '' - An attribute set (or an expression generated by mkNameValuePairs) - representing a logstash configuration's output section. - See inputConfig description for details. - ''; - apply = mergeConfigs; + default = ''stdout { debug => true debug_format => "json"}''; + description = "Logstash output configuration"; }; }; }; @@ -127,35 +37,26 @@ in ###### implementation - config = mkMerge [ { - lib.logstash = { - mkFloat = stringRep: { __type = "float"; value = stringRep; }; - - mkHash = attrs: { __type = "hash"; value = attrs; }; - - mkNameValuePairs = mergeConfigs; - }; - } ( mkIf cfg.enable { + config = mkIf cfg.enable { systemd.services.logstash = with pkgs; { description = "Logstash daemon"; - wantedBy = [ "multi-user.target" ]; - path = [ jre ]; + serviceConfig = { + ExecStart = "${jre}/bin/java -jar ${logstash} agent -f ${writeText "logstash.conf" '' + input { + ${cfg.inputConfig} + } - script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" '' - input { - ${exprToConfig cfg.inputConfig} - } + filter { + ${cfg.filterConfig} + } - filter { - ${exprToConfig cfg.filterConfig} - } - - output { - ${exprToConfig cfg.outputConfig} - } - ''} &> /var/log/logstash.log"; + output { + ${cfg.outputConfig} + } + ''}"; + }; }; - })]; + }; } From 1453be4740f9735a2a66480a68f3648cab7684d2 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 31 Oct 2013 15:59:59 +0100 Subject: [PATCH 031/760] nixos/logstash: add option examples --- nixos/modules/services/logging/logstash.nix | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 373476c66999..21128779e8f6 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -20,16 +20,39 @@ in inputConfig = mkOption { default = ''stdin { type => "example" }''; description = "Logstash input configuration"; + example = '' + # Read from journal + pipe { + command => "${pkgs.systemd}/bin/journalctl -f -o json" + type => "syslog" codec => json {} + } + ''; }; filterConfig = mkOption { default = ''noop {}''; description = "logstash filter configuration"; + example = '' + if [type] == "syslog" { + # Keep only relevant systemd fields + # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html + prune { + whitelist_names => [ + "type", "@timestamp", "@version", + "MESSAGE", "PRIORITY", "SYSLOG_FACILITY", + ] + } + } + ''; }; outputConfig = mkOption { default = ''stdout { debug => true debug_format => "json"}''; description = "Logstash output configuration"; + example = '' + redis { host => "localhost" data_type => "list" key => "logstash" codec => json } + elasticsearch { embedded => true } + ''; }; }; }; From 8b1ab6d912b690329cff8a6ef0da2559488aeede Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 1 Nov 2013 14:09:17 +0100 Subject: [PATCH 032/760] nixos/logstash: add test --- nixos/tests/default.nix | 1 + nixos/tests/logstash.nix | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 nixos/tests/logstash.nix diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix index ce5776c8e465..574e1dd2f8b8 100644 --- a/nixos/tests/default.nix +++ b/nixos/tests/default.nix @@ -16,6 +16,7 @@ with import ../lib/testing.nix { inherit system minimal; }; kde4 = makeTest (import ./kde4.nix); #kexec = makeTest (import ./kexec.nix); login = makeTest (import ./login.nix {}); + logstash = makeTest (import ./logstash.nix); latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; })); misc = makeTest (import ./misc.nix); #mpich = makeTest (import ./mpich.nix); diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix new file mode 100644 index 000000000000..ee309d39f872 --- /dev/null +++ b/nixos/tests/logstash.nix @@ -0,0 +1,40 @@ +{ pkgs, ... }: + +# This test runs logstash and checks if messages flows and elasticsearch is +# started + +{ + nodes = { + one = + { config, pkgs, ... }: + { + services = { + logstash = { + enable = true; + inputConfig = '' + exec { command => "echo flowers" interval => 1 type => "test" } + exec { command => "echo dragons" interval => 1 type => "test" } + ''; + filterConfig = '' + if [type] == "test" { + grep { match => ["message", "flowers"] drop => true } + } + ''; + outputConfig = '' + stdout { codec => rubydebug } + elasticsearch { embedded => true } + ''; + }; + }; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("logstash.service"); + $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers"); + $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); + $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash"); + ''; +} From 576058fe0e6d2188a5f3ed9bc2506dd1a09f6ad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 17:41:52 +0100 Subject: [PATCH 033/760] haskell-git-annex: update to version 4.20131101 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index e32a7dc52b9b..394e7580771e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131024"; - sha256 = "1a4mrx8zr5znhcy2cszv5ri9avqj7lcn467nmaj172f00vn4fd5x"; + version = "4.20131101"; + sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; isLibrary = false; isExecutable = true; buildDepends = [ From 2d79cc7950187a02deb9f05fb20a5b7df82fc872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 1 Nov 2013 22:41:14 +0100 Subject: [PATCH 034/760] fetchsvn: handle redirect(s) Instead of failing if the server redirects us to a new URL, accept up to 2 redirects by printing 2 extra p's to subversion. --- pkgs/build-support/fetchsvn/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index ea52ca19fa67..68dce2cc585b 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -21,8 +21,8 @@ fi; # Pipe the "p" character into Subversion to force it to accept the # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic -# hash of the output matters. -echo 'p' | svn export ${ignoreExternals:+--ignore-externals} \ +# hash of the output matters. Pass in extra p's to handle redirects. +printf 'p\np\np\n' | svn export ${ignoreExternals:+--ignore-externals} \ -r "$rev" "$url" "$out" stopNest From 023d74049cf27c32e7a5b51ef1d1403150981fde Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 2 Nov 2013 01:45:27 +0100 Subject: [PATCH 035/760] varnish: adding version 2.1.x --- pkgs/servers/varnish/2.1.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/varnish/2.1.nix diff --git a/pkgs/servers/varnish/2.1.nix b/pkgs/servers/varnish/2.1.nix new file mode 100644 index 000000000000..ef1b177054f6 --- /dev/null +++ b/pkgs/servers/varnish/2.1.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig }: + +stdenv.mkDerivation rec { + version = "2.1.5"; + name = "varnish-${version}"; + + src = fetchurl { + url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; + sha256 = "10zgwn482gfmfb7n6xwi7p841bs3j58jnk55wg83b85d2jz4k01d"; + }; + + buildInputs = [ pcre libxslt groff ncurses pkgconfig ]; + + meta = { + description = "Web application accelerator also known as a caching HTTP reverse proxy"; + homepage = "https://www.varnish-cache.org"; + license = stdenv.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d302685bc303..2be392278df6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2042,6 +2042,8 @@ let varnish = callPackage ../servers/varnish { }; + varnish2 = callPackage ../servers/varnish/2.1.nix { }; + venus = callPackage ../tools/misc/venus { python = python27; }; From 6d059b2ee5bff0f7ef679056dc9877e18256e711 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 2 Nov 2013 01:46:30 +0100 Subject: [PATCH 036/760] ejabberd: updated to 2.1.13 --- pkgs/servers/xmpp/ejabberd/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 788fe0d6ccb2..f15705d4a113 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: stdenv.mkDerivation rec { - version = "2.1.10"; - name = "ejabberd-2.1.10"; + version = "2.1.13"; + name = "ejabberd-${version}"; src = fetchurl { - url = http://www.process-one.net/downloads/ejabberd/2.1.10/ejabberd-2.1.10.tar.gz; - sha256 = "1gijv6d90w9fq0as2l0mp0fn65jihgd86nxry98pv6liks4fbhlx"; + url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; + sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { ''; preConfigure = '' cd src - ''; + ''; configureFlags = ["--enable-pam"]; - + meta = { description = "Open-source XMPP application server written in Erlang"; license = "GPLv2"; From b15bbdfa17b364f13fae408876941ec419c6597f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 2 Nov 2013 04:09:27 +0100 Subject: [PATCH 037/760] pythonPackage: afew and alot update to latest added subprocess32 package as new dependency of afew --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dc6a36bb7e0..fff3a7b31a4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,21 +187,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { afew = buildPythonPackage rec { - rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199"; + rev = "d5d0ddeae0c5758a3f6cf5de77913804d88e906a"; name = "afew-1.0_${rev}"; src = fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "74926d9ddfa69534cfbd08a82f0acccab2c649558062654d5d2ff2999d201384"; + sha256 = "0al7hz994sh0yrpixqafr25acglvniq4zsbs9aj89zr7yzq1g1j0"; }; - propagatedBuildInputs = [ pythonPackages.notmuch pkgs.dbacl ]; + buildInputs = [ pkgs.dbacl ]; + + propagatedBuildInputs = [ + pythonPackages.notmuch + pythonPackages.subprocess32 + pythonPackages.chardet + ]; - # error: invalid command 'test' doCheck = false; postInstall = '' + substituteInPlace afew/DBACL.py "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'" wrapProgram $out/bin/afew \ --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib ''; @@ -289,13 +295,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { alot = buildPythonPackage rec { - rev = "0711cf8efaf1a4cca24617c3406210a415006457"; - name = "alot-0.3.4_${rev}"; + rev = "fa10bfc2de105da819c8e11e913a44c3c1ac60a4"; + name = "alot-0.3.5_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1rxkx9cjajsv9x1dl4xp1r3vr0kb66sglxaqzjiwaknqzahmmji5"; + sha256 = "0zd4jiwxqb7m672xkr5jcqkfpk9jx1kmkllyvjjvswkgjjqdrhax"; }; # error: invalid command 'test' @@ -5938,6 +5944,23 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + subprocess32 = buildPythonPackage rec { + name = "subprocess32-3.2.5rc1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz"; + md5 = "f5f46106368be6336b54af95d048fea9"; + }; + + doCheck = false; + + meta = { + homepage = "https://pypi.python.org/pypi/subprocess32"; + description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x."; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; + sphinx = buildPythonPackage (rec { name = "Sphinx-1.1.3"; From d1e8f9c047ead008c5b0de487d61ca3d68616f98 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sat, 2 Nov 2013 18:09:08 +0000 Subject: [PATCH 038/760] haskell-wxc: noHaddock --- pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index b89b39acb50a..d95b07121af1 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so ''; patches = [ ./fix-bogus-pointer-assignment.patch ]; + noHaddock = true; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; From eab39f9dda288581d393739f39353bbb10a7806c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 2 Nov 2013 20:41:54 +0100 Subject: [PATCH 039/760] venus.nix: Fix broken startAt option --- nixos/modules/programs/venus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 2b3bfbc6c188..9a077d404920 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -40,7 +40,7 @@ in }; dates = mkOption { - default = "*:0,15,30,45"; + default = "*:0/15"; type = types.string; description = '' Specification (in the format described by @@ -167,7 +167,7 @@ in serviceConfig.User = "${cfg.user}"; serviceConfig.Group = "${cfg.group}"; environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - startOn = cfg.dates; + startAt = cfg.dates; }; }; From fce38e454ba86b5ef3aff2f3be926033112bfa62 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sun, 3 Nov 2013 13:00:49 +0400 Subject: [PATCH 040/760] Make touchpad button mapping configurable --- .../modules/services/x11/hardware/synaptics.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 5884e9aa31c8..91e01f2e30b1 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -57,6 +57,13 @@ let cfg = config.services.xserver.synaptics; in description = "Whether to enable tap buttons."; }; + buttonsMap = mkOption { + default = [1 2 3]; + example = [1 3 2]; + description = "Remap touchpad buttons."; + apply = map toString; + }; + palmDetect = mkOption { default = false; example = true; @@ -104,10 +111,13 @@ let cfg = config.services.xserver.synaptics; in Option "MinSpeed" "${cfg.minSpeed}" Option "MaxSpeed" "${cfg.maxSpeed}" Option "AccelFactor" "${cfg.accelFactor}" - Option "TapButton1" "${if cfg.tapButtons then "1" else "0"}" - Option "TapButton2" "${if cfg.tapButtons then "2" else "0"}" - Option "TapButton3" "${if cfg.tapButtons then "3" else "0"}" ${if cfg.tapButtons then "" else ''Option "MaxTapTime" "0"''} + Option "TapButton1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "TapButton2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "TapButton3" "${builtins.elemAt cfg.buttonsMap 2}" + Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}" Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}" Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}" From 8487fdd2091953e626a9f560e34359973352b482 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 2 Nov 2013 18:05:16 +0100 Subject: [PATCH 041/760] mathematica: fix x86 build of mathematica the MathInstaller doesn't distinguish between 64bit and 32bit linux platforms. --- pkgs/applications/science/math/mathematica/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index cedb491cc8b9..997080ee303c 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -18,10 +18,8 @@ let platform = - if stdenv.system == "i686-linux" then + if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "Linux" - else if stdenv.system == "x86_64-linux" then - "Linux-x86-64" else throw "Mathematica requires i686-linux or x86_64 linux"; in From 795753bbc6ceece3fabcdcaca24010f62538b77c Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Tue, 29 Oct 2013 11:33:46 +0100 Subject: [PATCH 042/760] quodlibet: update to version 2.6.3 also provides two distinctive flavours, which either wrap the program to pull in the gstreamer plugins or not. --- pkgs/applications/audio/quodlibet/default.nix | 34 +++++++++++++------ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 9f4859d6e070..c865314cb175 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,11 +1,18 @@ { stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject -, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }: +, pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null +, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: -let version = "2.5"; in +assert withGstPlugins -> gst_plugins_base != null + || gst_plugins_good != null + || gst_plugins_ugly != null + || gst_plugins_bad != null; + +let version = "2.6.3"; in buildPythonPackage { # call the package quodlibet and just quodlibet - name = "quodlibet-${version}"; + name = "quodlibet-${version}" + + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"; namePrefix = ""; # XXX, tests fail @@ -13,12 +20,12 @@ buildPythonPackage { src = [ (fetchurl { - url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz"; - sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb"; + url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; + sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; }) (fetchurl { - url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz"; - sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff"; + url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; + sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; }) ]; @@ -30,19 +37,23 @@ buildPythonPackage { ''; patches = [ ./quodlibet-package-plugins.patch ]; - buildInputs = [ - gst_plugins_base gst_plugins_good gst_plugins_ugly + buildInputs = stdenv.lib.optionals withGstPlugins [ + gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad ]; propagatedBuildInputs = [ mutagen pygtk pygobject pythonDBus gst_python ]; - postInstall = '' + postInstall = stdenv.lib.optionalString withGstPlugins '' # Wrap quodlibet so it finds the GStreamer plug-ins wrapProgram "$out/bin/quodlibet" --prefix \ GST_PLUGIN_PATH ":" \ - "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10" + ${ stdenv.lib.concatStringsSep ":" + (map (s: s+"/lib/gstreamer-0.10") + (stdenv.lib.filter (s: s != null) [ + gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad + ])) } ''; meta = { @@ -62,6 +73,7 @@ buildPythonPackage { & internet radio, and all major audio formats. ''; + maintainer = [ stdenv.lib.maintainers.coroa ]; homepage = http://code.google.com/p/quodlibet/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be392278df6..8ed314daf40d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8561,6 +8561,12 @@ let inherit (pythonPackages) mutagen; }; + quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { + inherit (pythonPackages) mutagen; + withGstPlugins = true; + gst_plugins_bad = null; + }; + rakarrack = callPackage ../applications/audio/rakarrack { inherit (xorg) libXpm libXft; fltk = fltk13; From 61e0337a5c7c47ebb09932cd57b880177ce4ccc3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 3 Nov 2013 18:58:27 +0100 Subject: [PATCH 043/760] afew: forgot to add --replace --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fff3a7b31a4b..e0ff73db94c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -206,8 +206,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { doCheck = false; + preConfigure = '' + substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'" + ''; + postInstall = '' - substituteInPlace afew/DBACL.py "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'" wrapProgram $out/bin/afew \ --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib ''; From 268bb64b6823d6c4e6cee70713e10232ad09f497 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 3 Nov 2013 20:14:48 -0500 Subject: [PATCH 044/760] Linux 3.12 release Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index f0929af1d292..dd61d8242642 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12-rc3"; + version = "3.12"; + + modDirVersion = "3.12.0"; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.xz"; - sha256 = "1rayb0f4n81yp9ghcws0v36dpqyl9ks3naf37p2qy7jvrwagmj28"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "00jshh7abn8fj6zsbmfaxxfpg83033413k5nqqfsb7z1zp3hw4if"; }; features.iwlwifi = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed314daf40d..16cf42d5de79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6820,7 +6820,7 @@ let linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_11; + linuxPackages_latest = pkgs.linuxPackages_3_12; # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 882c2b72781b4254d9baaa370f52f050ad79b04e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 4 Nov 2013 12:07:03 +0100 Subject: [PATCH 045/760] fcron: Fix error when cron.mailto is null. Signed-off-by: Moritz Ulrich --- nixos/modules/services/scheduling/fcron.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 0c0811ca6e0e..fda29ca0482b 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -8,11 +8,14 @@ let queuelen = if cfg.queuelen == null then "" else "-q ${toString cfg.queuelen}"; + # Duplicate code, also found in cron.nix. Needs deduplication. systemCronJobs = '' SHELL=${pkgs.bash}/bin/bash PATH=${config.system.path}/bin:${config.system.path}/sbin - MAILTO="${config.services.cron.mailto}" + ${optionalString (config.services.cron.mailto != null) '' + MAILTO="${config.services.cron.mailto}" + ''} NIX_CONF_DIR=/etc/nix ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} ''; From 8274bd331aa17e660a8f31ac0e2cafa634eb857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 3 Nov 2013 01:03:45 +0100 Subject: [PATCH 046/760] redshift: add platforms --- pkgs/applications/misc/redshift/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3bed6e1a2d76..ae983aedc679 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages ''; - meta = { + meta = with stdenv.lib; { description = "changes the color temperature of your screen gradually"; longDescription = '' The color temperature is set according to the position of the @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { ''; license = "GPLv3+"; homepage = "http://jonls.dk/redshift"; + platforms = platforms.linux; }; } From 99914f8581d7526877ff596a0b16c0e0a2d3cd59 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 4 Nov 2013 18:45:05 +0400 Subject: [PATCH 047/760] Add serverFlagsSection parameter to the xserver config --- nixos/modules/services/x11/xserver.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e391da5c5721..f02c12b4bb64 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -333,6 +333,18 @@ in ''; }; + serverFlagsSection = mkOption { + default = ""; + example = + '' + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" + ''; + description = "Contents of the ServerFlags section of the X server configuration file."; + }; + moduleSection = mkOption { default = ""; example = @@ -568,6 +580,7 @@ in '' Section "ServerFlags" Option "AllowMouseOpenFail" "on" + ${cfg.serverFlagsSection} EndSection Section "Module" From 8c1e14e6cc4d2c3c44093936fe47d169db1e7829 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 4 Nov 2013 12:00:34 +0400 Subject: [PATCH 048/760] Add GNU Screen program module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/screen.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/modules/programs/screen.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 62e5b8e49c2c..4a7254023307 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -55,6 +55,7 @@ ./programs/venus.nix ./programs/wvdial.nix ./programs/zsh/zsh.nix + ./programs/screen.nix ./rename.nix ./security/apparmor.nix ./security/apparmor-suid.nix diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix new file mode 100644 index 000000000000..1c63ebe6a11e --- /dev/null +++ b/nixos/modules/programs/screen.nix @@ -0,0 +1,30 @@ +{ config, pkgs, ... }: + +let + inherit (pkgs.lib) mkOption mkIf types; + cfg = config.programs.screen; +in + +{ + ###### interface + + options = { + programs.screen = { + + screenrc = mkOption { + default = ""; + description = '' + The contents of /etc/screenrc file. + ''; + type = types.lines; + }; + }; + }; + + ###### implementation + + config = mkIf (cfg.screenrc != "") { + environment.etc."screenrc".text = cfg.screenrc; + }; + +} From a734f32fa1efce21a008e391cfb10695c4d738cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 4 Nov 2013 12:40:01 +0100 Subject: [PATCH 049/760] Remove desktopManager.gnome Gnome doesn't work at least since I started using NixOS half a year ago, let's not give wrong impressions to newcomers. Packaging gnome3 is still something on horizon. --- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/gnome.nix | 42 ------------------- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/gnome.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index ab3ced4c9e2c..035b23b4e1bb 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -17,7 +17,7 @@ in # Note: the order in which desktop manager modules are imported here # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. - imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ./e17.nix ]; + imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix deleted file mode 100644 index b0212446ad36..000000000000 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, pkgs, ... }: - -with pkgs.lib; - -let - - cfg = config.services.xserver.desktopManager.gnome; - gnome = pkgs.gnome; - -in - -{ - - options = { - - services.xserver.desktopManager.gnome.enable = mkOption { - default = false; - example = true; - description = "Enable a gnome terminal as a desktop manager."; - }; - - }; - - config = mkIf cfg.enable { - - services.xserver.desktopManager.session = singleton - { name = "gnome"; - start = '' - ${gnome.gnometerminal}/bin/gnome-terminal -ls & - waitPID=$! - ''; - }; - - environment.systemPackages = - [ gnome.gnometerminal - gnome.GConf - gnome.gconfeditor - ]; - - }; - -} From b232825c07b6dbb4b16f37c4a53f170f79374176 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 18:42:28 +0100 Subject: [PATCH 050/760] adobe-reader: Update to 9.5.5 --- pkgs/applications/misc/adobe-reader/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 46ccdb399467..a186f5f5ee0d 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux"; -let version = "9.5.1"; in +let version = "9.5.5"; in stdenv.mkDerivation { name = "adobe-reader-${version}-1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2"; - sha256 = "19mwhbfsivb21zmrz2hllf0kh4i225ac697y026bakyysn0vig56"; + sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16cf42d5de79..d3a32b2c6b32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7334,7 +7334,7 @@ let abook = callPackage ../applications/misc/abook { }; - adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aewan = callPackage ../applications/editors/aewan { }; @@ -10240,9 +10240,9 @@ let LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib export LD_LIBRARY_PATH ''; - }; + }; - patoline = PatolineEnv ocamlPackages_4_00_1; + patoline = PatolineEnv ocamlPackages_4_00_1; znc = callPackage ../applications/networking/znc { }; @@ -10264,4 +10264,9 @@ let mg = callPackage ../applications/editors/mg { }; + + # Attributes for backward compatibility. + adobeReader = adobe-reader; + + }; in pkgs From 1138f0a96b3cd46894b059ba135310a1464ce1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 4 Nov 2013 19:37:53 +0100 Subject: [PATCH 051/760] SDL2: update to v2.0.1 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7bc27362a296..79522dbf2cb8 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -23,11 +23,11 @@ let ''; in stdenv.mkDerivation rec { - name = "SDL2-2.0.0"; + name = "SDL2-2.0.1"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg"; + sha256 = "1w1jcz7hilk4fl8wlhiwvd1licg8lwy0brqz05562xv7l81fkrqa"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. From a22c0fa54a3e4e321057ea7dd0851f24857e6fe2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 4 Nov 2013 19:39:13 +0100 Subject: [PATCH 052/760] offlineimap: update to (latest) 6.5.5 --- pkgs/tools/networking/offlineimap/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index fa1d2fb805a7..02e1f742201f 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,14 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.5-rc2"; + version = "6.5.5"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { - url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}"; - name = "${name}.tar.bz"; - sha256 = "03w3irh8pxwvivi139xm5iaj2f8vmriak1ispq9d9f84z1098pd3"; + url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; + sha256 = "00k84qagph3xnxss6rkxm61x07ngz8fvffx4z9jyw5baf3cdd32p"; }; doCheck = false; From 0e831bd525cf3eb3b88c9073a049741b1e65431a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Nov 2013 18:26:55 +0100 Subject: [PATCH 053/760] Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. --- .../compilers/ghc/with-packages-old.nix | 127 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 + 2 files changed, 132 insertions(+) create mode 100644 pkgs/development/compilers/ghc/with-packages-old.nix diff --git a/pkgs/development/compilers/ghc/with-packages-old.nix b/pkgs/development/compilers/ghc/with-packages-old.nix new file mode 100644 index 000000000000..8acb2511e81d --- /dev/null +++ b/pkgs/development/compilers/ghc/with-packages-old.nix @@ -0,0 +1,127 @@ +{stdenv, ghc, packages ? [], makeWrapper}: + +stdenv.mkDerivation rec { + name = "haskell-env-${ghc.name}"; + + allPackages = stdenv.lib.filter (x: x ? pname) (stdenv.lib.closePropagation packages); + buildInputs = allPackages ++ [makeWrapper]; + propagatedBuildInputs = packages; + + unpackPhase = "true"; + + installPhase = '' + numversion=$(${ghc}/bin/ghc --numeric-version) + majorversion=''${numversion%%.*} + minorversion=''${numversion#*.} + minorversion=''${minorversion%%.*} + + if [[ $majorversion -gt 6 ]] && [[ $minorversion -gt 4 ]]; then + globalConf="--global-package-db" + else + globalConf="--global-conf" + fi + + originalTopDir="${ghc}/lib/ghc-${ghc.version}" + originalPkgDir="$originalTopDir/package.conf.d" + linkedTopDir="$out/lib/ghc-${ghc.version}" + linkedPkgDir="$linkedTopDir/package.conf.d" + + mkdir -p $out/bin + mkdir -p $linkedTopDir + mkdir -p $linkedPkgDir + + echo "Linking GHC core libraries:" + + echo -n "Linking $originalTopDir " + for f in "$originalTopDir/"*; do + if test -f $f; then + ln -s $f $linkedTopDir + echo -n . + fi + done + echo + + echo -n "Linking $originalPkgDir " + for f in "$originalPkgDir/"*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo + + echo "Linking selected packages and dependencies:" + + for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do + currentPkgDir="$currentPath/lib/ghc-${ghc.version}" + # Check if current path is a Cabal package for the current GHC + if test -d $currentPkgDir; then + echo -n "Linking $currentPath " + for f in "$currentPath/bin/"*; do + ln -s $f $out/bin + echo -n . + done + for f in "$currentPath/etc/bash_completion.d/"*; do + mkdir -p $out/etc/bash_completion.d + ln -s $f $out/etc/bash_completion.d/ + echo -n . + done + for s in 1 2 3 4 5 6 7 8 9; do + for f in "$currentPath/share/man/man$s/"*; do + mkdir -p $out/share/man/man$s + ln -sv $f $out/share/man/man$s/ + echo -n . + done + done + for f in "$currentPath/share/emacs/site-lisp/"*; do + mkdir -p $out/share/emacs/site-lisp + ln -s $f $out/share/emacs/site-lisp/ + echo -n . + done + for f in "$currentPath/share/ghci/"*; do + mkdir -p $out/share/ghci + ln -s $f $out/share/ghci/ + echo -n . + done + for f in "$currentPkgDir/package.conf.d/"*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo + fi + done + + echo -n "Generating package cache " + ${ghc}/bin/ghc-pkg $globalConf $linkedPkgDir recache + echo . + + echo -n "Generating wrappers " + + for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do + # The NIX env-vars are picked up by our patched version of ghc-paths. + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags "-B$linkedTopDir" \ + --set "NIX_GHC" "$out/bin/ghc" \ + --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_LIBDIR" "$linkedTopDir" + echo -n . + done + + for prg in runghc runhaskell; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" + echo -n . + done + + for prg in ghc-pkg ghc-pkg-${ghc.version}; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "$globalConf $linkedPkgDir" + echo -n . + done + + for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do + if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then + ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . + fi + done + echo + ''; + + meta = ghc.meta; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be07da47393d..3d63b00dcc07 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -106,6 +106,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x packages = pkgs self; }; + ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix { + ghc = ghc; # refers to ghcPlain + packages = pkgs self; + }; + # This is the Cabal builder, the function we use to build most Haskell # packages. It isn't the Cabal library, which is spelled "Cabal". From b551f8bced96fa069d41007faf5a9eb6f5974e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 4 Nov 2013 19:49:57 +0100 Subject: [PATCH 054/760] SDL2: clean configure flags. I removed some flags that are no longer present, one that was redundant (default value) and added a comment regarding why enable-static is there. --- pkgs/development/libraries/SDL2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 79522dbf2cb8..8da6fefd1aa4 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -15,10 +15,11 @@ assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> pulseaudio != null; let + # force enable-static, to workaround this bug: + # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 configureFlagsFun = attrs: '' - --disable-oss --disable-video-x11-xme - --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared - --disable-osmesa-shared --enable-static + --enable-static --disable-oss --disable-x11-shared + --disable-pulseaudio-shared --disable-alsa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; in From d6d2de4147b8d0a19f6d70751d46eb405a2779b5 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 4 Nov 2013 22:55:13 +0400 Subject: [PATCH 055/760] Add qvim - an experimental Qt gui for Vim vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality. For example, qvim is able to correctly bind keys like Alt-. More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features --- pkgs/applications/editors/vim/qvim.nix | 133 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++ 2 files changed, 144 insertions(+) create mode 100644 pkgs/applications/editors/vim/qvim.nix diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix new file mode 100644 index 000000000000..85c177f31bce --- /dev/null +++ b/pkgs/applications/editors/vim/qvim.nix @@ -0,0 +1,133 @@ +args@{...}: with args; + + +let inherit (args.composableDerivation) composableDerivation edf; in +composableDerivation { + # use gccApple to compile on darwin + mkDerivation = ( if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv ).mkDerivation; +} (fix: { + + name = "qvim-7.4"; + + enableParallelBuilding = true; # test this + + src = fetchgit { + url = https://bitbucket.org/equalsraf/vim-qt.git ; + rev = "4160bfd5c1380e899d2f426b494fc4f1cf6ae85e"; + sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; + }; + + preConfigure = assert (! stdenv.isDarwin); ""; + # # if darwin support is enabled, we want to make sure we're not building with + # # OS-installed python framework + # preConfigure + # = stdenv.lib.optionalString + # (stdenv.isDarwin && (config.vim.darwin or true)) '' + # # TODO: we should find a better way of doing this as, if the configure + # # file changes, we need to change these line numbers + # sed -i "5641,5644d" src/auto/configure + # sed -i "5648d" src/auto/configure + # ''; + + configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; + + nativeBuildInputs + = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau + libXmu libICE qt4]; + + # prePatch = "cd src"; + + # patches = + # [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 + # ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 + # ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 + # ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 + # ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 + # ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; + + # most interpreters aren't tested yet.. (see python for example how to do it) + flags = { + ftNix = { + # because we cd to src in the main patch phase, we can't just add this + # patch to the list, we have to apply it manually + postPatch = '' + cd runtime + patch -p2 < ${./ft-nix-support.patch} + cd .. + ''; + }; + } + // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. + // edf { name = "xsmp"; } #Disable XSMP session management + // edf { name = "xsmp_interact"; } #Disable XSMP interaction + // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. + + // edf { + name = "python"; + feat = "pythoninterp"; + enable = { + nativeBuildInputs = [ python ]; + } // lib.optionalAttrs stdenv.isDarwin { + configureFlags + = [ "--enable-pythoninterp=yes" + "--with-python-config-dir=${python}/lib" ]; + }; + } + + // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} + // edf { name = "cscope"; } #Include cscope interface. + // edf { name = "workshop"; } #Include Sun Visual Workshop support. + // edf { name = "netbeans"; } #Disable NetBeans integration support. + // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface. + // edf { name = "multibyte"; } #Include multibyte editing support. + // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support. + // edf { name = "xim"; } #Include XIM input support. + // edf { name = "fontset"; } #Include X fontset output support. + // edf { name = "acl"; } #Don't check for ACL support. + // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). + // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()). + ; + + cfg = { + pythonSupport = config.vim.python or true; + rubySupport = config.vim.ruby or true; + nlsSupport = config.vim.nls or false; + tclSupport = config.vim.tcl or false; + multibyteSupport = config.vim.multibyte or false; + cscopeSupport = config.vim.cscope or false; + netbeansSupport = config.netbeans or true; # eg envim is using it + + # by default, compile with darwin support if we're compiling on darwin, but + # allow this to be disabled by setting config.vim.darwin to false + darwinSupport = stdenv.isDarwin && (config.vim.darwin or true); + + # add .nix filetype detection and minimal syntax highlighting support + ftNixSupport = config.vim.ftNix or true; + }; + + postInstall = stdenv.lib.optionalString stdenv.isLinux '' + rpath=`patchelf --print-rpath $out/bin/qvim`; + for i in $nativeBuildInputs; do + echo adding $i/lib + rpath=$rpath:$i/lib + done + echo $nativeBuildInputs + echo $rpath + patchelf --set-rpath $rpath $out/bin/qvim + ''; + + dontStrip = 1; + + meta = with stdenv.lib; { + description = "The most popular clone of the VI editor (Qt GUI fork)"; + homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.unix; + }; +}) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b274c4043bc..30089eeb1645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8884,6 +8884,17 @@ let vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { + inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext + composableDerivation lib config python perl tcl ruby qt4; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + + features = "huge"; # one of tiny, small, normal, big or huge + lua = pkgs.lua5; + flags = [ "python" "X11" ]; # only flag "X11" by now + }); + virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; From 59cad4dc0768d081d291206f8af20c25fe0e047d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 19:27:57 +0100 Subject: [PATCH 056/760] socate: Update to 1.7.2.2, 2.0.0-b6 CVE-2013-3571 --- pkgs/tools/networking/socat/2.0.0-b3.nix | 29 ------------------------ pkgs/tools/networking/socat/2.x.nix | 20 ++++++++++++++++ pkgs/tools/networking/socat/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 ++--- 4 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 pkgs/tools/networking/socat/2.0.0-b3.nix create mode 100644 pkgs/tools/networking/socat/2.x.nix diff --git a/pkgs/tools/networking/socat/2.0.0-b3.nix b/pkgs/tools/networking/socat/2.0.0-b3.nix deleted file mode 100644 index 6567e5dfcc40..000000000000 --- a/pkgs/tools/networking/socat/2.0.0-b3.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; -let - version = "2.0.0-b3"; - patches = []; -in -rec { - src = /* Here a fetchurl expression goes */ - fetchurl { - url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b3.tar.bz2; - sha256 = "0p4v8m898dzcardsw02xdda3y3b1rky7v956rm27x43783w5qmsx"; - }; - - buildInputs = [openssl]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - - name = "socat-" + version; - meta = { - description = "Socat - a different replacement for netcat"; - longDesc = " - Socat, one more analogue of netcat, but not mimicking it. - 'netcat++' (extended design, new implementation) -"; - homepage = "http://www.dest-unreach.org/socat/"; - srcs = patches; - }; -} diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix new file mode 100644 index 000000000000..621803134426 --- /dev/null +++ b/pkgs/tools/networking/socat/2.x.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "socat-2.0.0-b6"; + + src = fetchurl { + url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; + sha256 = "03n70v7ygsl4ji7rwvyv8f70d3q32jnas26j29amkf3fm4agnhvz"; + }; + + buildInputs = [ openssl ]; + + meta = { + description = "A utility for bidirectional data transfer between two independent data channels"; + homepage = http://www.dest-unreach.org/socat/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = stdenv.lib.maintainers.eelco; + }; +} diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 727bbe086059..45de7015d7ab 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "socat-1.7.2.1"; + name = "socat-1.7.2.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0xw2qmmixv7jwsrgx2vy54bq695d6my3pm3z4dcpmf9vqvb2xsps"; + sha256 = "0g4miazc9w3gxbk5vvw228jp3qxn775jspkgqv5hjf2d3bqpl5ls"; }; buildInputs = [ openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3a32b2c6b32..f9307bb7974f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1803,15 +1803,13 @@ let socat = callPackage ../tools/networking/socat { }; + socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); + sourceHighlight = callPackage ../tools/text/source-highlight { # Boost 1.54 causes the "test_regexranges" test to fail boost = boost153; }; - socat2pre = lowPrio (builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix { - inherit fetchurl stdenv openssl; - }); - squashfsTools = callPackage ../tools/filesystems/squashfs { }; sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { }; From 798ce14839437ac3b5d25377bfe696301ad842fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:03:23 +0100 Subject: [PATCH 057/760] apache-httpd: Update to 2.4.6 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bbf84a852b8f..c6cec588a3cc 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.4.6"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0p35jy6mkb1q48bia719qxs5bwxv0wadyhxi61rsr93nrbgbvalj"; + sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2"; }; buildInputs = [perl] ++ From 0296defd0c4e54e9387695e3527721c2af206660 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:23:47 +0100 Subject: [PATCH 058/760] Remove some unsupported platforms --- lib/platforms.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/platforms.nix b/lib/platforms.nix index 8be37d7ed1e7..76df389deacd 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -2,9 +2,9 @@ let lists = import ./lists.nix; in rec { gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" "armv7l-linux" "mips64el-linux"]; + linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv7l-linux" "mips64el-linux"]; darwin = ["x86_64-darwin"]; - freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"]; + freebsd = ["i686-freebsd" "x86_64-freebsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"]; netbsd = ["i686-netbsd" "x86_64-netbsd"]; cygwin = ["i686-cygwin"]; From 01087750bacd329543c69876c0a7faac395098d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:25:20 +0100 Subject: [PATCH 059/760] Don't build some packages on some platforms --- .../version-management/subversion/default.nix | 2 +- pkgs/development/libraries/aterm/2.5.nix | 3 ++- pkgs/development/libraries/aterm/2.8.nix | 10 +++++++--- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/monitoring/zabbix/2.0.nix | 2 +- pkgs/servers/monitoring/zabbix/default.nix | 2 +- pkgs/tools/security/fail2ban/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index b1469038d42d..8169011c325d 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index f116da12643e..df509943ba27 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; } diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index 498b0244b877..6d4b13f165a6 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: let isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; in -stdenv.mkDerivation ( { +stdenv.mkDerivation { name = "aterm-2.8"; src = fetchurl { @@ -23,9 +23,13 @@ stdenv.mkDerivation ( { # feel too serious to just ignore. doCheck = true; + dontStrip = isMingw; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; -} // ( if isMingw then { dontStrip = true; } else {}) ) +} diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index e9b1dba22e15..c91d6bbf761a 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = http://httpd.apache.org/; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons lovek323 ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c6cec588a3cc..9e687e9c843a 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = http://httpd.apache.org/; license = licenses.asl20; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with maintainers; [ lovek323 simons ]; }; } diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 1386e1609eb9..f4fde2dadefd 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -81,7 +81,7 @@ in homepage = http://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index b106921cdf69..22c10a6e972f 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -62,7 +62,7 @@ in homepage = http://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 1a443fc18b61..6196cc53bb28 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -48,6 +48,6 @@ pythonPackages.buildPythonPackage { description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 63de9c306939..70b9bf69e290 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "GNU wdiff, comparing files on a word by word basis"; license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From 754704ea1884563beda72ddff2ab328e690278d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:32:49 +0100 Subject: [PATCH 060/760] Allow packages to be marked as "broken" by setting meta.broken The effect is that they won't show up in "nix-env -qa" anymore. --- doc/meta.xml | 9 +++++++++ nixos/modules/module-list.nix | 2 +- pkgs/applications/virtualization/nova/client.nix | 1 + pkgs/applications/virtualization/nova/default.nix | 15 ++++++++------- pkgs/applications/virtualization/xen/default.nix | 1 + pkgs/stdenv/generic/default.nix | 4 ++++ 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index 09252410d807..df84915cc091 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -118,6 +118,15 @@ interpretation: package). + + broken + If set to true, the package is + marked as “broken”, meaning that it won’t show up in + nix-env -qa, and cannot be built or installed. + Sush packages should be removed from Nixpkgs eventually unless + they are fixed. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eaa8e03f17fd..b8f09bc48e0c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -279,5 +279,5 @@ ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix - ./virtualisation/xen-dom0.nix + #./virtualisation/xen-dom0.nix ] diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix index bb65f80d2066..bcc72d19bb39 100644 --- a/pkgs/applications/virtualization/nova/client.nix +++ b/pkgs/applications/virtualization/nova/client.nix @@ -16,5 +16,6 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = https://github.com/rackspace/python-novaclient; description = "Client library and command line tool for the OpenStack Nova API"; + broken = true; }; } diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix index a9a36ffca4fe..c1ef20b7aa08 100644 --- a/pkgs/applications/virtualization/nova/default.nix +++ b/pkgs/applications/virtualization/nova/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. + # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python novaclient ]; buildInputs = - [ pythonPackages.python + [ pythonPackages.python pythonPackages.wrapPython pythonPackages.mox intltool @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { substituteInPlace nova/api/ec2/cloud.py \ --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh ''; - + buildPhase = "python setup.py build"; installPhase = - '' + '' p=$(toPythonPath $out) export PYTHONPATH=$p:$PYTHONPATH mkdir -p $p @@ -59,14 +59,14 @@ stdenv.mkDerivation rec { # computes some stuff from its own argv[0]. So put the wrapped # programs in $out/libexec under their original names. mkdir -p $out/libexec/nova - + wrapProgram() { local prog="$1" local hidden=$out/libexec/nova/$(basename "$prog") mv $prog $hidden makeWrapper $hidden $prog "$@" } - + wrapPythonPrograms cp -prvd etc $out/etc @@ -86,9 +86,10 @@ stdenv.mkDerivation rec { doCheck = false; # !!! fix checkPhase = "python setup.py test"; - + meta = { homepage = http://nova.openstack.org/; description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; + broken = true; }; } diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 3cb16a6b4425..5f149b059787 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -136,5 +136,6 @@ stdenv.mkDerivation { description = "Xen hypervisor and management tools for Dom0"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; + broken = true; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f8aff33a327f..083a71548b91 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -18,6 +18,8 @@ let allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; + allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + stdenvGenerator = setupScript: rec { # The stdenv that we are producing. @@ -51,6 +53,8 @@ let mkDerivation = attrs: if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" + else if !allowBroken && attrs.meta.broken or false then + throw "you can't use package ‘${attrs.name}’ because it has been marked as broken" else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) From a5827b18a19094dba7974c9cfe12416c02db0d23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 21:07:35 +0100 Subject: [PATCH 061/760] Don't build Linux 3.6-rpi packages on Hydra They're all broken. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9307bb7974f..ddf2ec8e1267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6813,7 +6813,7 @@ let linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; - linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); + linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); From a0e21fd1ca2db70064cb65e0c1c99872c2ddf6ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 21:07:57 +0100 Subject: [PATCH 062/760] Mark more packages as broken --- pkgs/applications/networking/browsers/icecat-3/default.nix | 1 + pkgs/applications/networking/browsers/netsurf/haru.nix | 1 + .../networking/browsers/netsurf/libParserUtils.nix | 1 + pkgs/applications/networking/browsers/netsurf/libnsgif.nix | 1 + pkgs/applications/science/misc/vite/default.nix | 2 ++ pkgs/applications/version-management/veracity/default.nix | 1 + pkgs/applications/video/tvtime/default.nix | 1 + pkgs/development/libraries/caelum/default.nix | 1 + pkgs/development/libraries/java/icedtea/default.nix | 2 ++ pkgs/development/libraries/libdc1394avt/default.nix | 1 + pkgs/development/libraries/libmusclecard/default.nix | 1 + pkgs/development/libraries/libopensc-dnie/default.nix | 1 + pkgs/development/libraries/opencv/2.1.nix | 1 + pkgs/development/libraries/unicap/default.nix | 1 + pkgs/development/tools/profiling/systemtap/default.nix | 1 + pkgs/games/soi/default.nix | 1 + pkgs/misc/emulators/VisualBoyAdvance/default.nix | 3 ++- pkgs/os-specific/linux/v86d/default.nix | 1 + pkgs/servers/evolution-data-server/default.nix | 1 + pkgs/servers/openafs-client/default.nix | 5 ++--- pkgs/servers/radius/default.nix | 2 ++ pkgs/servers/x11/xorg/unichrome/default.nix | 3 ++- pkgs/tools/filesystems/xtreemfs/default.nix | 1 + pkgs/tools/misc/w3c-css-validator/default.nix | 1 + pkgs/tools/misc/xmltv/default.nix | 1 + pkgs/tools/networking/ntop/default.nix | 4 +--- pkgs/tools/security/opensc/0.11.7.nix | 1 + 27 files changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7e181669cd1c..84269a290e9a 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -114,5 +114,6 @@ stdenv.mkDerivation { passthru = { inherit gtk version; isFirefox3Like = true; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 883cf94b06fe..47f0c2f64552 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = "ZLIB/LIBPNG"; # see README. maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index 8ee8518c531c..fec93c39ab9d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { license = "MIT"; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 63ae2ef86d43..5894e5c1c033 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { license = "MIT"; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 4c1cf318b5a2..2e25ff582ee9 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + + broken = true; }; } diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 6bf452c18210..4c69f41106b8 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -102,6 +102,7 @@ rec { ]; platforms = with a.lib.platforms; linux ; + broken = true; }; }) x diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix index eef6e9caf165..2ec5e813c412 100644 --- a/pkgs/applications/video/tvtime/default.nix +++ b/pkgs/applications/video/tvtime/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index e48ed5a76928..808310e326f0 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; license = "LGPLv2.1+"; + broken = true; }; } diff --git a/pkgs/development/libraries/java/icedtea/default.nix b/pkgs/development/libraries/java/icedtea/default.nix index 51f375a36f95..094e2a10f950 100644 --- a/pkgs/development/libraries/java/icedtea/default.nix +++ b/pkgs/development/libraries/java/icedtea/default.nix @@ -108,5 +108,7 @@ stdenv.mkDerivation rec { # Restrict to GNU systems for now. platforms = stdenv.lib.platforms.gnu; + + broken = true; }; } diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 1fcdeae0d116..69f66d7f5b7b 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index 5968c6d9a55b..af235b833826 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index d229933111e8..c231682b6211 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = "nonfree"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index ea5b1313dc7f..4b0ccc0903ff 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 7a64017ca8ba..daec5a785662 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -45,6 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 293ff66f29d0..bdd11b88da5b 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 811d8d432ceb..a61d2f370d04 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -46,6 +46,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free-noncopyleft"; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 95f7d9433f9b..942bf2c21840 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation { sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp ''; buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - + meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; + broken = true; }; } diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 698a7ab4ec88..4c6045e1a6cb 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; license = "BSD"; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index 364bb55a5ee9..3a905a82db8b 100644 --- a/pkgs/servers/evolution-data-server/default.nix +++ b/pkgs/servers/evolution-data-server/default.nix @@ -46,6 +46,7 @@ rec { ]; platforms = with a.lib.platforms; linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 247628c30a62..462ecadd346d 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation { homepage = http://www.openafs.org; license = stdenv.lib.licenses.ipl10; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ - z77z - ]; + maintainers = stdenv.lib.maintainers.z77z; + broken = true; }; } diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index 5533469a1da1..dcd577bb6cb7 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -29,5 +29,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; + + broken = true; }; } diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index 720ccd10158d..bc1ebf4eb43e 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -4,7 +4,7 @@ xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, autoconf, libtool, libXext, utilmacros, pixman}: stdenv.mkDerivation { - name = "xf86-video-unichrome-git"; + name = "xf86-video-unichrome"; src = fetchgit { url = "git://people.freedesktop.org/~libv/xf86-video-unichrome"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = "free"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 6d1f863fdeaa..81be62b5159a 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -69,6 +69,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.bsd3; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index 5cfe87376388..f08fe87202f0 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation { license = "w3c"; # http://www.w3.org/Consortium/Legal/ maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix index 4b8ba43f597d..9d3939406066 100644 --- a/pkgs/tools/misc/xmltv/default.nix +++ b/pkgs/tools/misc/xmltv/default.nix @@ -12,4 +12,5 @@ import ../../../development/perl-modules/generic perl { perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP ]; + meta.broken = true; } diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index 48f2c9f08938..d5fa2deb68dc 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; - homepage = http://www.ntop.org/products/ntop/; - platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix index e18858363013..526b0276848f 100644 --- a/pkgs/tools/security/opensc/0.11.7.nix +++ b/pkgs/tools/security/opensc/0.11.7.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = "LGPL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } From 06f4398b4643fd32fb7d1057b382e70def01edef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 21:09:48 +0100 Subject: [PATCH 063/760] Remove broken and obsolete versions of gcj and ghdl --- pkgs/top-level/all-packages.nix | 26 -------------------------- pkgs/top-level/release-python.nix | 1 - pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 4 files changed, 29 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf2ec8e1267..1d870057043d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2565,20 +2565,6 @@ let gcj = gcj45; - gcj44 = wrapGCC (gcc44.gcc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = true; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkgconfig; - inherit gtk; - inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender - libXrandr xproto renderproto xextproto inputproto randrproto; - }); - gcj45 = wrapGCC (gcc45.gcc.override { name = "gcj"; langJava = true; @@ -2672,18 +2658,6 @@ let enableMultilib = false; }); - # Not officially supported version for ghdl - ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 { - inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which - ppl cloogppl; - name = "ghdl"; - langVhdl = true; - langCC = false; - langC = false; - profiledCompiler = false; - enableMultilib = false; - })); - gcl = builderDefsPackage ../development/compilers/gcl { inherit mpfr m4 binutils fetchcvs emacs zlib which texinfo; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 2453712584ac..5aafba980b90 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -372,7 +372,6 @@ let gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index ef7bc038c62f..921a6e741343 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -53,7 +53,6 @@ with (import ./release-lib.nix); gcc34 = linux; gcc42 = linux; gcc44 = linux; - gcj44 = linux; ghdl = linux; glibc = linux; glibcLocales = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 87b63e33891f..7fa545a8f6df 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -116,7 +116,6 @@ let gcc34 = linux; gcc42 = linux; gcc44 = linux; - gcj44 = linux; ghdl = linux; ghostscript = linux; ghostscriptX = linux; From 8867304b5e8bab1741b5b32d7a503d58fccf055e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 4 Nov 2013 22:41:16 +0100 Subject: [PATCH 064/760] filezilla: bump 3.6.0.2 -> 3.7.3 Includes security fixes, bug fixes and some (minor) new features. Changelog is available here: https://filezilla-project.org/versions.php Also: * break long lines * add meta.platforms * use licenses.gpl2 attribute instead of a literal string. --- .../networking/ftp/filezilla/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 24fdd1053417..b7c9a76e151f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }: +{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext +, pkgconfig, xdg_utils, gtk2, sqlite }: -let version = "3.6.0.2"; in +let version = "3.7.3"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk"; + sha256 = "0hn043jjb7qh040dgyhffp9jrrmca1xxbc998vyqyg83lrq2j09b"; }; configureFlags = [ "--disable-manualupdatecheck" ]; - buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; + buildInputs = [ + dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + ]; - meta = { + meta = with stdenv.lib; { homepage = "http://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; - license = "GPLv2"; - + license = licenses.gpl2; longDescription = '' FileZilla Client is a free, open source FTP client. It supports FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available under many platforms, binaries for Windows, Linux and Mac OS X are provided. ''; + platforms = platforms.linux; }; } From a2cbc77e4f1cf55a9c142d07377f67b0f83985ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 23:31:08 +0100 Subject: [PATCH 065/760] Only show/build a package on the platforms listed in meta.platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function ‘mkDerivation’ now checks whether the current platform type is included in a package's meta.platform field. If not, it throws an exception: $ nix-build -A linux --argstr system x86_64-darwin error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’ These packages also no longer show up in ‘nix-env -qa’ output. This means, for instance, that the number of packages shown on x86_64-freebsd has dropped from 9268 to 4764. Since meta.platforms was also used to prevent Hydra from building some packages, there now is a new attribute meta.hydraPlatforms listing the platforms on which Hydra should build the package (which defaults to meta.platforms). --- doc/meta.xml | 41 +++++++++++++++++++ .../version-management/darcs/default.nix | 9 ++-- pkgs/os-specific/linux/kernel/generic.nix | 3 -- pkgs/os-specific/linux/nvidia-x11/default.nix | 5 ++- pkgs/stdenv/generic/default.nix | 2 + pkgs/top-level/release-lib.nix | 8 ++-- 6 files changed, 55 insertions(+), 13 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index df84915cc091..00e9b8ac67a1 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -118,6 +118,47 @@ interpretation: package). + + platforms + The list of Nix platform types on which the + package is supported. If this attribute is set, the package will + refuse to build, and won’t show up in nix-env + -qa output, on any platform not listed + here. An example is: + + +meta.platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + + + The set lib.platforms defines various common + lists of platforms types, so it’s more typical to write: + + +meta.platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + + + + + + + hydraPlatforms + The list of Nix platform types for which the Hydra + instance at hydra.nixos.org should build the + package. (Hydra is the Nix-based continuous build system.) It + defaults to the value of meta.platforms. Thus, + the only reason to set meta.hydraPlatforms is + if you want hydra.nixos.org to build the + package on a subset of meta.platforms, or not + at all, e.g. + + +meta.platforms = stdenv.lib.platforms.linux; +meta.hydraPlatforms = []; + + + + + broken If set to true, the package is diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index f33e479b3ada..8ec65e50adf3 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -21,10 +21,13 @@ cabal.mkDerivation (self: { mv contrib/darcs_completion $out/etc/bash_completion.d/darcs ''; meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; + homepage = http://darcs.net/; + description = "A distributed, interactive, smart revision control system"; license = "GPL"; - platforms = self.ghc.meta.platforms; + # FIXME: this gives an infinite recursion in the "darcs" attribute + # in all-packages.nix. + #platforms = self.ghc.meta.platforms; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1ade24736279..3e1fc920a59b 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -40,9 +40,6 @@ , ... }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.isArm || stdenv.system == "mips64el-linux"; - assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; let diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 35595a7b8f4f..f9239bb5fba1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch - ; + ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch; src = if stdenv.system == "i686-linux" then @@ -58,5 +57,7 @@ stdenv.mkDerivation { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 083a71548b91..fcd7439e97e8 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -55,6 +55,8 @@ let throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else if !allowBroken && attrs.meta.broken or false then throw "you can't use package ‘${attrs.name}’ because it has been marked as broken" + else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then + throw "the package ‘${attrs.name}’ is not supported on ‘${result.system}’" else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 3280df09dd54..e2f5309ced33 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -119,14 +119,12 @@ rec { # May fail as much as it wishes, we will catch the error. processPackage = attrSet: - if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then + if attrSet.recurseForDerivations or false then packagesWithMetaPlatform attrSet - else if attrSet ? recurseForRelease && attrSet.recurseForRelease then + else if attrSet.recurseForRelease or false then packagesWithMetaPlatform attrSet else - if attrSet ? meta && attrSet.meta ? platforms - then attrSet.meta.platforms - else []; + attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []); /* Common platform groups on which to test packages. */ From c88055e1a2703fbc7dd1d072f273626afe1d6b97 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 00:04:36 +0100 Subject: [PATCH 066/760] Set meta.hydraPlatforms instead of meta.platforms for some packages --- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/graphics/zgrviewer/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 3 +-- pkgs/data/fonts/andagii/default.nix | 3 +-- pkgs/development/libraries/aqbanking/default.nix | 2 +- .../libraries/haskell/accelerate-cuda/default.nix | 2 +- .../libraries/haskell/accelerate-examples/default.nix | 2 +- .../libraries/haskell/accelerate-fft/default.nix | 2 +- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- pkgs/games/alienarena/default.nix | 3 ++- pkgs/games/dwarf-therapist/default.nix | 3 ++- pkgs/games/flightgear/default.nix | 3 ++- pkgs/games/naev/default.nix | 3 ++- pkgs/games/oilrush/default.nix | 3 ++- pkgs/games/sauerbraten/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 3 ++- pkgs/games/torcs/default.nix | 3 ++- pkgs/games/ufoai/default.nix | 3 ++- pkgs/games/unvanquished/default.nix | 3 ++- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/vdrift/default.nix | 3 ++- pkgs/games/widelands/default.nix | 3 ++- pkgs/games/xonotic/default.nix | 3 ++- pkgs/os-specific/linux/ati-drivers/default.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 2 +- pkgs/servers/http/joseki/default.nix | 3 +-- pkgs/tools/graphics/welkin/default.nix | 3 +-- pkgs/tools/system/fdisk/default.nix | 3 +-- pkgs/tools/typesetting/tex/texlive/cm-super.nix | 2 +- pkgs/tools/typesetting/tex/texlive/extra.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++----- 34 files changed, 52 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 611d9f4226dd..b684fee37d56 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -39,6 +39,6 @@ pythonPackages.buildPythonPackage rec { local hard drive. ''; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 5fe30bd7a03d..93d1b28854a6 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { # Quicker to unpack locally than load Hydra - platforms = []; + hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; lgpl21Plus; description = "GraphViz graph viewer/navigator"; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 5c8cb7203245..68d1cca7e736 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -74,8 +74,7 @@ rec { # A GiB of data. Installation is unpacking and editing a few files. # No sense in letting Hydra build it. # Also, it is unclear what is covered by "verbatim" - we will edit configs - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "verbatim-redistribution"; }; passthru = { diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 6e59e97171e2..8b08708fb1d0 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -43,8 +43,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; # There are multiple claims that the font is GPL, # so I include the package; but I cannot find the # original source, so use it on your own risk diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 0ddb1aaa7492..7dfc6a60a99f 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; # Tries to install gwenhywfar plugin, thus `make install` fails - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index cabfccc02669..49cb597b2a5d 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index b9536052dd2d..8cb5433726ff 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index b3c1cb90b299..ef378faa08fd 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index ac9e41fd628f..98d97c82e514 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -33,7 +33,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index e9f1fe166bdc..9de2cf9f80aa 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index d9852971adfc..b3c2dd14718e 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { # Engine is under GPLv2, everything else is under license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index d8f39ceeea4a..c7e594f89bda 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = "MIT"; - platforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 71183d0ea2ad..f3ddb633e879 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin ]; - #platforms = platforms.linux; # disabled from hydra because it's so big + platforms = platforms.linux; + hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 4516afaef6dc..c2a7ee90a1f6 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { homepage = http://www.naev.org; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b96fd7c3e9f2..f62570dbd089 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation { homepage = http://oilrush-game.com/; license = "unfree"; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 8bec0f7b1a95..eb5d933e885d 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -66,7 +66,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; + hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data []; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index e920b8c633e0..7a78235bdff1 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://speed-dreams.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric raskin]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index f5b713ae3373..9f1fdedd5779 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = http://torcs.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index d9955aec3eb4..2fef444328cd 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 2768d2fad9e1..9ba3a442eb73 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { homepage = http://unvanquished.net; #license = "unknown"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = stdenv.lib.platforms.linux; # This package can take a lot of disk space, so unavailable from channel - #platforms = with stdenv.lib.platforms; linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 535e575fdc40..020d60fa3fae 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { homepage = http://www.urbanterror.net; license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 97bd1ab432d9..af112c37af4f 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = http://vdrift.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index e20adc8faa73..65c991340728 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -64,7 +64,8 @@ rec { raskin jcumming ]; - #platforms = a.lib.platforms.linux; + platforms = a.lib.platforms.linux; + hydraPlatforms = []; license = a.lib.licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 957d7b2c7f45..5245c12e6ceb 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 326de9ed81ae..ab95accd7493 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; maintainers = [stdenv.lib.maintainers.marcweber]; - #platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = []; }; # moved assertions here because the name is evaluated when the NixOS manual is generated diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index fdf2f139c331..6d28c376078d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -15,5 +15,5 @@ in import ./generic.nix (args // rec { features.iwlwifi = true; - extraMeta.platforms = []; + extraMeta.hydraPlatforms = []; }) diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 6ca5caba9440..f42ae81a700d 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -105,8 +105,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; # Builder is just unpacking/mixing what is needed + hydraPlatforms = []; # Builder is just unpacking/mixing what is needed license = "free"; # mix of packages under different licenses homepage = "http://openjena.org/"; }; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index d02b38b41279..23c5ec11aaad 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -46,8 +46,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "free-noncopyleft"; }; passthru = { diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 111408d1339c..e72497cf7c4e 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; - maintainers = [ ]; - #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 4d161c3e0536..066796ed39c9 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -30,6 +30,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 6613578e2c67..b49f02d6fda5 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -19,6 +19,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 0ce1afbb41b3..f4db43f21f2b 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -21,6 +21,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 4cb93794edfe..f7d8f1254c55 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -24,6 +24,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d870057043d..8ed8524a0277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,7 +2290,7 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = lib.addMetaAttrs { platforms = []; } + gcc44_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.4) { inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs gettext which; @@ -2339,7 +2339,7 @@ let gcc47 = gcc47_real; - gcc45_realCross = lib.addMetaAttrs { platforms = []; } + gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib ppl cloogppl gettext which noSysDirs; @@ -2351,7 +2351,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc46_realCross = lib.addMetaAttrs { platforms = []; } + gcc46_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.6) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2363,7 +2363,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc47_realCross = lib.addMetaAttrs { platforms = []; } + gcc47_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.7) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2384,7 +2384,7 @@ let if isMingw then windows.mingw_headers1 else null; in wrapGCCCross { - gcc = forceNativeDrv (lib.addMetaAttrs { platforms = []; } ( + gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( gcc_realCross.override { crossStageStatic = true; langCC = false; From d9c13a73c21d656bdbfa6802b1d8b823f9efa588 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 00:07:24 +0100 Subject: [PATCH 067/760] gurobi: Remove It's proprietary, non-redistributable software. --- nixos/modules/module-list.nix | 2 - nixos/modules/programs/gurobi.nix | 43 ------------------- nixos/modules/services/misc/gurobi.nix | 41 ------------------ pkgs/development/libraries/gurobi/default.nix | 25 ----------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 113 deletions(-) delete mode 100644 nixos/modules/programs/gurobi.nix delete mode 100644 nixos/modules/services/misc/gurobi.nix delete mode 100644 pkgs/development/libraries/gurobi/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b8f09bc48e0c..09625511bba5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -46,7 +46,6 @@ ./programs/bash/command-not-found.nix ./programs/blcr.nix ./programs/environment.nix - ./programs/gurobi.nix ./programs/info.nix ./programs/shadow.nix ./programs/shell.nix @@ -120,7 +119,6 @@ ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gpsd.nix - ./services/misc/gurobi.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nixos-manual.nix diff --git a/nixos/modules/programs/gurobi.nix b/nixos/modules/programs/gurobi.nix deleted file mode 100644 index 7fa099b0884f..000000000000 --- a/nixos/modules/programs/gurobi.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, pkgs, ... }: - -with pkgs.lib; - -let - cfg = config.programs.gurobi; -in { - options = { - programs.gurobi = { - license = mkOption { - default = null; - - description = "Path to the Gurobi license file if not using a token server"; - - type = types.nullOr types.path; - }; - - tokenServerAddress = mkOption { - default = null; - - description = "Address of the token server"; - - type = types.nullOr types.string; - }; - }; - }; - - config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) { - assertions = [ { - assertion = cfg.license == null || cfg.tokenServerAddress == null; - message = "Please only set one of a gurobi license file and a gurobi token server address"; - } ]; - - environment.variables.GRB_LICENSE_FILE = if cfg.license != null - then cfg.license - else pkgs.writeTextFile { - name = "gurobi-generated-license"; - text = "TOKENSERVER=${cfg.tokenServerAddress}"; - }; - - environment.systemPackages = [ pkgs.gurobi ]; - }; -} diff --git a/nixos/modules/services/misc/gurobi.nix b/nixos/modules/services/misc/gurobi.nix deleted file mode 100644 index 9cd76a1e78f7..000000000000 --- a/nixos/modules/services/misc/gurobi.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, pkgs, ... }: - -with pkgs.lib; - -let - cfg = config.services.gurobi.tokenServer; -in { - options = { - services.gurobi.tokenServer = { - enable = mkOption { - default = false; - - description = "Whether to enable the Gurobi token server"; - - type = types.bool; - }; - - license = mkOption { - description = "Path to the Gurobi license file"; - - type = types.path; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.gurobi-token-server = { - description = "Gurobi token server"; - - wantedBy = [ "multi-user.target" ]; - - environment.GRB_LICENSE_FILE = cfg.license; - - serviceConfig = { - ExecStart = "${pkgs.gurobi}/bin/grb_ts"; - - Type = "forking"; - }; - }; - }; -} diff --git a/pkgs/development/libraries/gurobi/default.nix b/pkgs/development/libraries/gurobi/default.nix deleted file mode 100644 index 4bdee56ae991..000000000000 --- a/pkgs/development/libraries/gurobi/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, requireFile }: - -stdenv.mkDerivation { - name = "gurobi-5.6.0"; - - src = requireFile { - name = "gurobi5.6.0_linux64.tar.gz"; - sha256 = "1qwfjyx5y71x97gkndqnl9h4xc8hl48zwcwss7jagqfj3gxwvnky"; - url = "http://www.gurobi.com/download/gurobi-optimizer"; - }; - - installPhase = "mv linux64 $out"; - - fixupPhase = '' - interp=`cat $NIX_GCC/nix-support/dynamic-linker` - find $out/bin -type f -executable -exec patchelf --interpreter "$interp" --set-rpath $out/lib {} \; - ''; - - meta = { - description = "State-of-the-art mathematical programming solver"; - homepage = http://www.gurobi.com/; - license = "unfree"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed8524a0277..0e976cbc0448 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4450,8 +4450,6 @@ let gts = callPackage ../development/libraries/gts { }; - gurobi = callPackage ../development/libraries/gurobi {}; - gvfs = callPackage ../development/libraries/gvfs { }; gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; From 80633828677cd3762709a097964ca25bab10babc Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Tue, 5 Nov 2013 08:52:23 +0100 Subject: [PATCH 068/760] Removed unnecessary mkIf The whole block is already wrapped in cfg.enable and this breaks some things. --- nixos/modules/services/search/elasticsearch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 9d345e30361e..b3d934862abf 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -91,7 +91,7 @@ in { target = "elasticsearch/logging.yml"; } ]; - systemd.services.elasticsearch = mkIf cfg.enable { + systemd.services.elasticsearch = { description = "Elasticsearch daemon"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; From d098a6d9264ead9e02930599231d267b56a00be6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 10:46:44 +0100 Subject: [PATCH 069/760] Add Finance::Quote --- pkgs/top-level/perl-packages.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 90058aec2426..6b8b8b05c525 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3534,6 +3534,20 @@ rec { propagatedBuildInputs = [ TestScript ]; }; + FinanceQuote = buildPerlPackage { + name = "Finance-Quote-1.18"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.18.tar.gz; + sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393"; + }; + propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ]; + meta = { + homepage = http://finance-quote.sourceforge.net/; + description = "Get stock and mutual fund quotes from various exchanges"; + license = "gpl"; + }; + }; + FontAFM = buildPerlPackage rec { name = "Font-AFM-1.20"; src = fetchurl { @@ -3800,6 +3814,15 @@ rec { buildInputs = [ pkgs.unzip ]; }; + HTMLElementExtended = buildPerlPackage { + name = "HTML-Element-Extended-1.18"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz; + sha256 = "f3ef1af108f27fef15ebec66479f251ce08aa49bd00b0462c9c80c86b4b6b32b"; + }; + propagatedBuildInputs = [ HTMLTree ]; + }; + HTMLFromANSI = buildPerlPackage { name = "HTML-FromANSI-2.03"; src = fetchurl { @@ -3894,6 +3917,15 @@ rec { propagatedBuildInputs = [HTMLParser]; }; + HTMLTableExtract = buildPerlPackage { + name = "HTML-TableExtract-2.11"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.11.tar.gz; + sha256 = "1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee"; + }; + propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; + }; + HTMLTagset = buildPerlPackage rec { name = "HTML-Tagset-3.20"; src = fetchurl { From da426c7df579ae7f1a2f04613ebbdc4ac7e8cd72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 10:46:59 +0100 Subject: [PATCH 070/760] Fix some meta.platforms attributes to build more stuff on Darwin --- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/libraries/gts/default.nix | 2 +- pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/development/libraries/libiconv/default.nix | 2 +- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/libxslt/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/development/perl-modules/DBD-SQLite/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 6713dd12b3cd..faa5bba5e4a7 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -462,7 +462,7 @@ stdenv.mkDerivation ({ # Volunteers needed for the {Cyg,Dar}win ports of *PPL. # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). - platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ]; + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7eb519a045c3..7724bc5cc3ab 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 1202ab5825d7..78e016c1582e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "An OpenType text shaping engine"; homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7562765a3ac3..b286dcfcd199 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; # This library is not needed on GNU platforms. - platforms = [ "i686-cygwin" ]; + hydraPlatforms = stdenv.lib.platforms.cygwin ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index e25074f8d126..c2012a444394 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; license = "bsd"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ed56ffaff736..e2568af6c9bc 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = "bsd"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } // (if !stdenv.isFreeBSD then {} else { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 99bf8f10fd82..ca1db1372064 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 7521abc599be..de96ab58eaef 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 332a3bd0e8f6..06688ded22a5 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -35,5 +35,5 @@ buildPerlPackage rec { # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). doCheck = false; - meta.platforms = stdenv.lib.platforms.linux; + meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 29591bf0335c..59a3c51c4d6e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { meta = { description = "Qt-based GUI for wpa_supplicant"; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c1aebd3dfe1a..0ef70a197d6f 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { interfaces for other technical domains. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; }; } From d2de64cc66bab38e661a793bba36d0e7196e7beb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 5 Nov 2013 07:19:38 -0500 Subject: [PATCH 071/760] Fix broken meta.platforms for manual-config kernel Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 29eb170287ad..f097f2562d02 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,8 +1,8 @@ { stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile }: -with stdenv.lib; - let + inherit (stdenv.lib) + hasAttr getAttr optionalAttrs optional optionalString maintainers platforms; # Function to parse the config file into a nix expression readConfig = configFile: @@ -169,6 +169,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.shlevy ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } From b5554b3f5c53404b7c8cdd03191bcd1357691d59 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 5 Nov 2013 14:15:42 +0100 Subject: [PATCH 072/760] libvirt: Update to 1.1.4 Remove the patch that has been added upstream. --- .../development/libraries/libvirt/default.nix | 7 ++--- .../libraries/libvirt/securtyfs_userns.patch | 30 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/libraries/libvirt/securtyfs_userns.patch diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ce81c1b2e8c2..8431b1823e13 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -3,14 +3,14 @@ , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng }: -let version = "1.1.2"; in +let version = "1.1.4"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - md5 = "1835bbfa492099bce12e2934870e5611"; + sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r"; }; buildInputs = @@ -19,9 +19,6 @@ stdenv.mkDerivation { libcap_ng ]; - # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html - patches = [ ./securtyfs_userns.patch ]; - preConfigure = '' PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch deleted file mode 100644 index 2723334f94af..000000000000 --- a/pkgs/development/libraries/libvirt/securtyfs_userns.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/lxc/lxc_container.c -+++ b/src/lxc/lxc_container.c -@@ -750,7 +750,7 @@ err: - } - - --static int lxcContainerMountBasicFS(void) -+static int lxcContainerMountBasicFS(bool userns_enabled) - { - const struct { - const char *src; -@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) - continue; - #endif - -+ if (STREQ(mnts[i].src, "securityfs") && userns_enabled) -+ continue; -+ - if (virFileMakePath(mnts[i].dst) < 0) { - virReportSystemError(errno, - _("Failed to mkdir %s"), -@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, - goto cleanup; - - /* Mounts the core /proc, /sys, etc filesystems */ -- if (lxcContainerMountBasicFS() < 0) -+ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) - goto cleanup; - - /* Mounts /proc/meminfo etc sysinfo */ From 2d44f3e8af2a31c36250ba3ba20e3122d8515448 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 5 Nov 2013 14:19:11 +0100 Subject: [PATCH 073/760] sbt: Update to 0.13.0 Also remove all old sbt versions, and rename package to sbt instead of simple-build-tool. sbt seems to be the correct name for this package. --- .../simple-build-tool/default.nix | 103 ++++-------------- 1 file changed, 20 insertions(+), 83 deletions(-) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index e446bf1c1eb3..13a216799a2d 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -1,93 +1,30 @@ -{ stdenv, versionedDerivation, fetchurl, version ? "xsbt-0.12.3" }: +{ stdenv, fetchurl, jre }: -let +stdenv.mkDerivation rec { + name = "sbt-${version}"; + version = "0.13.0"; - description = "A build tool for Scala"; - longDescription = name: '' - ${name} is a simple build tool for Scala projects that aims to do the - basics well. - - This package is the sbt launcher which automatically manages - and downloads dependencies, including the SBT package and the - Scala compiler. - ''; - - metaSBT = { - inherit description; - longDescription = longDescription "sbt"; - homepage = http://code.google.com/p/simple-build-tool/; - license = "bsd"; - }; - - metaXSBT = { - inherit description; - longDescription = longDescription "xsbt"; - homepage = https://github.com/harrah/xsbt; - license = "bsd"; - }; - -in - -# Depends on a JRE at runtime. - -versionedDerivation "simple-build-tool" version { - "0.7.3" = let version = "0.7.3"; in { - name = "simple-build-tool-${version}"; - src = fetchurl { - url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; - sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6k"; - }; - meta = metaSBT; + src = fetchurl { + url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; + sha256 = "04s49v5mw4kwz1rmvbf07kq51i2m0lcv60c9i5y524gjj518pk1w"; }; - "0.7.7" = let version = "0.7.7"; in { - name = "simple-build-tool-${version}"; - src = fetchurl { - url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; - # sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6j"; - sha256 = "2720b033012a7509f7fbdfddfa69c07b105452a6f95bc410cb7dc34c1594ab3d"; - }; - meta = metaSBT; - }; - - "xsbt-0.11.2" = let version = "0.11.2"; in { # scala 2.9 - name = "xsbt-${version}"; - - # scala needs much more PermGen space - javaArgs = "-Xmx1024M"; - # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup - src = fetchurl { - url = http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/0.11.2/sbt-launch.jar; - sha256 = "14fbzvb1s66wpbqznw65a7nn27qrq1i9pd7wlbydv8ffl49d262n"; - }; - meta = metaXSBT; - }; - - "xsbt-0.12.3" = let version = "0.12.3"; in { - name = "xsbt-${version}"; - - # Recommended java options from sbt Getting started guide - javaArgs = "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"; - # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup - src = fetchurl { - url = http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar; - sha256 = "11r26abjzmnmpn65ndbq60qg31s3ichkvzpmxyrq941s1n1dbxgh"; - }; - meta = metaXSBT; - }; -} -{ + phases = [ "installPhase" ]; installPhase = '' - mkdir -pv "$out/lib/java" - cp $src "$out/lib/java/sbt-launch-${version}.jar" - mkdir -p "$out/bin" - cat > "$out/bin/sbt" < $out/bin/sbt << EOF + #!/bin/sh + SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M" + ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@" EOF - chmod u+x "$out/bin/sbt" + chmod +x $out/bin/sbt ''; - phases = "installPhase"; + meta = { + homepage = http://www.scala-sbt.org/; + license = stdenv.lib.licenses.bsd3; + description = "A build tool for Scala, Java and more"; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + }; } From 43ecb12e939ce89dec73e2390c33a2bb09bb92c1 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 5 Nov 2013 22:30:47 +0400 Subject: [PATCH 074/760] gparted: remove unwanted icon-theme.cache (close #1176) --- pkgs/tools/misc/gparted/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 9e8b1f9e3224..00d2f759be4f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; From 1045df3197c5e735801952461538e3825961075d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 5 Nov 2013 22:43:50 +0100 Subject: [PATCH 075/760] Updating mkvtoolnix, libebml, libmatroska to latest versions. --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- pkgs/development/libraries/libebml/default.nix | 4 ++-- pkgs/development/libraries/libmatroska/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7d2eb514c94b..ed64448c13a8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.2.0"; + name = "mkvtoolnix-6.5.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn"; + sha256 = "0a3h878bsjbpb2r7b528xzyqzl8r82yhrniry9bnhmw7rcl53bd8"; }; buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index d85c205c68a6..a2065111190f 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.2.2"; + name = "libebml-1.3.0"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "19dp8m97xaj46iv6ahb5v0fb9sawjiy8wy1ylljc15ka8g30hss7"; + sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; }; configurePhase = "cd make/linux"; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 0bbc095c380f..67b9e7289550 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.3.0"; + name = "libmatroska-1.4.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "0scfs5lc1nvdfv7ipgg02h7wzxks48hc5lvgk9qmwdkihnayqcaj"; + sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8"; }; configurePhase = "cd make/linux"; From 9817bada91cb5b69ecaa8cf3ae393cc50a289881 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 5 Nov 2013 18:02:16 -0500 Subject: [PATCH 076/760] Update nodePackages to npm2nix-5.2.0 Signed-off-by: Shea Levy --- .../web/nodejs/build-node-package.nix | 13 +- pkgs/top-level/node-packages-generated.nix | 12218 ++++++---------- pkgs/top-level/node-packages.nix | 6 +- 3 files changed, 4621 insertions(+), 7616 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 217c81d43176..716bda30f0d1 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -11,6 +11,11 @@ let tar xf ${nodejs.src} mv *node* $out ''; + + peerDeps = listToAttrs (concatMap (dep: map (name: { + inherit name; + value = dep; + }) (filter (nm: !(elem nm (args.passthru.names or []))) dep.names)) (peerDependencies)); in stdenv.mkDerivation ({ unpackPhase = "true"; @@ -21,9 +26,9 @@ stdenv.mkDerivation ({ ${concatStrings (concatMap (dep: map (name: '' ln -sv ${dep}/lib/node_modules/${name} node_modules/ '') dep.names) deps)} - ${concatStrings (concatMap (dep: map (name: '' + ${concatStrings (mapAttrsToList (name: dep: '' ln -sv ${dep}/lib/node_modules/${name} node_modules/ - '') dep.names) peerDependencies)} + '') peerDeps)} export HOME=$(pwd) runHook postConfigure ''; @@ -51,9 +56,9 @@ stdenv.mkDerivation ({ done fi '') args.passthru.names)} - ${concatStrings (concatMap (dep: map (name: '' + ${concatStrings (mapAttrsToList (name: dep: '' mv node_modules/${name} $out/lib/node_modules - '') dep.names) peerDependencies)} + '') peerDeps)} mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true mv node_modules $out/.dependent-node-modules if [ -d "$out/lib/node_modules/.bin" ]; then diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 18ec19437dba..8df865009dc7 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,7 +1,9 @@ { self, fetchurl, lib }: { - full."CSSselect"."0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."CSSselect"."0.x" = + self.by-version."CSSselect"."0.3.11"; + by-version."CSSselect"."0.3.11" = lib.makeOverridable self.buildNodePackage { name = "CSSselect-0.3.11"; src = [ (fetchurl { @@ -10,16 +12,18 @@ }) ]; buildInputs = - (self.nativeDeps."CSSselect"."0.x" or []); + (self.nativeDeps."CSSselect" or []); deps = [ - self.full."CSSwhat"."0.4" - self.full."domutils"."1.2" + self.by-version."CSSwhat"."0.4.1" + self.by-version."domutils"."1.2.1" ]; peerDependencies = [ ]; passthru.names = [ "CSSselect" ]; }; - full."CSSwhat"."0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."CSSwhat"."0.4" = + self.by-version."CSSwhat"."0.4.1"; + by-version."CSSwhat"."0.4.1" = lib.makeOverridable self.buildNodePackage { name = "CSSwhat-0.4.1"; src = [ (fetchurl { @@ -28,14 +32,16 @@ }) ]; buildInputs = - (self.nativeDeps."CSSwhat"."0.4" or []); + (self.nativeDeps."CSSwhat" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "CSSwhat" ]; }; - full."abbrev"."1" = lib.makeOverridable self.buildNodePackage { + by-spec."abbrev"."1" = + self.by-version."abbrev"."1.0.4"; + by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "abbrev-1.0.4"; src = [ (fetchurl { @@ -44,46 +50,20 @@ }) ]; buildInputs = - (self.nativeDeps."abbrev"."1" or []); + (self.nativeDeps."abbrev" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "abbrev" ]; }; - full."abbrev"."1.0.x" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; - sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; - }) - ]; - buildInputs = - (self.nativeDeps."abbrev"."1.0.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "abbrev" ]; - }; - full."abbrev"."~1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; - sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; - }) - ]; - buildInputs = - (self.nativeDeps."abbrev"."~1.0.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "abbrev" ]; - }; - full."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."abbrev"."1.0.x" = + self.by-version."abbrev"."1.0.4"; + by-spec."abbrev"."~1.0.4" = + self.by-version."abbrev"."1.0.4"; + by-spec."active-x-obfuscator"."0.0.1" = + self.by-version."active-x-obfuscator"."0.0.1"; + by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "active-x-obfuscator-0.0.1"; src = [ (fetchurl { @@ -92,31 +72,35 @@ }) ]; buildInputs = - (self.nativeDeps."active-x-obfuscator"."0.0.1" or []); + (self.nativeDeps."active-x-obfuscator" or []); deps = [ - self.full."zeparser"."0.0.5" + self.by-version."zeparser"."0.0.5" ]; peerDependencies = [ ]; passthru.names = [ "active-x-obfuscator" ]; }; - full."addressparser"."~0.1" = lib.makeOverridable self.buildNodePackage { - name = "addressparser-0.1.3"; + by-spec."addressparser"."~0.2.0" = + self.by-version."addressparser"."0.2.0"; + by-version."addressparser"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "addressparser-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; - sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.0.tgz"; + sha1 = "853383313b7b60259ba4558ef1c0bc30efac08fc"; }) ]; buildInputs = - (self.nativeDeps."addressparser"."~0.1" or []); + (self.nativeDeps."addressparser" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "addressparser" ]; }; - full."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."adm-zip"."0.2.1" = + self.by-version."adm-zip"."0.2.1"; + by-version."adm-zip"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "adm-zip-0.2.1"; src = [ (fetchurl { @@ -125,14 +109,16 @@ }) ]; buildInputs = - (self.nativeDeps."adm-zip"."0.2.1" or []); + (self.nativeDeps."adm-zip" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "adm-zip" ]; }; - full."adm-zip"."~0.4.3" = lib.makeOverridable self.buildNodePackage { + by-spec."adm-zip"."~0.4.3" = + self.by-version."adm-zip"."0.4.3"; + by-version."adm-zip"."0.4.3" = lib.makeOverridable self.buildNodePackage { name = "adm-zip-0.4.3"; src = [ (fetchurl { @@ -141,14 +127,16 @@ }) ]; buildInputs = - (self.nativeDeps."adm-zip"."~0.4.3" or []); + (self.nativeDeps."adm-zip" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "adm-zip" ]; }; - full."almond"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."almond"."*" = + self.by-version."almond"."0.2.6"; + by-version."almond"."0.2.6" = lib.makeOverridable self.buildNodePackage { name = "almond-0.2.6"; src = [ (fetchurl { @@ -157,32 +145,17 @@ }) ]; buildInputs = - (self.nativeDeps."almond"."*" or []); + (self.nativeDeps."almond" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "almond" ]; }; - "almond" = self.full."almond"."*"; - full."ambi"."~2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "ambi-2.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ambi/-/ambi-2.1.4.tgz"; - sha1 = "1c0bafb3b1058754e1c3f9d7383948fc1b7c6926"; - }) - ]; - buildInputs = - (self.nativeDeps."ambi"."~2.1.4" or []); - deps = [ - self.full."typechecker"."~2.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ambi" ]; - }; - full."amdefine"."*" = lib.makeOverridable self.buildNodePackage { + "almond" = self.by-version."almond"."0.2.6"; + by-spec."amdefine"."*" = + self.by-version."amdefine"."0.1.0"; + by-version."amdefine"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "amdefine-0.1.0"; src = [ (fetchurl { @@ -191,47 +164,37 @@ }) ]; buildInputs = - (self.nativeDeps."amdefine"."*" or []); + (self.nativeDeps."amdefine" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "amdefine" ]; }; - "amdefine" = self.full."amdefine"."*"; - full."amdefine".">=0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "amdefine-0.1.0"; + "amdefine" = self.by-version."amdefine"."0.1.0"; + by-spec."amdefine".">=0.0.4" = + self.by-version."amdefine"."0.1.0"; + by-spec."ansi"."~0.2.1" = + self.by-version."ansi"."0.2.1"; + by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "ansi-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; - sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; + url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; + sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; }) ]; buildInputs = - (self.nativeDeps."amdefine".">=0.0.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "amdefine" ]; - }; - full."ansi"."~0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "ansi-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz"; - sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827"; - }) - ]; - buildInputs = - (self.nativeDeps."ansi"."~0.1.2" or []); + (self.nativeDeps."ansi" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ansi" ]; }; - full."ansi-remover"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."ansi-remover"."*" = + self.by-version."ansi-remover"."0.0.2"; + by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "ansi-remover-0.0.2"; src = [ (fetchurl { @@ -240,15 +203,17 @@ }) ]; buildInputs = - (self.nativeDeps."ansi-remover"."*" or []); + (self.nativeDeps."ansi-remover" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ansi-remover" ]; }; - "ansi-remover" = self.full."ansi-remover"."*"; - full."ansi-styles"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + "ansi-remover" = self.by-version."ansi-remover"."0.0.2"; + by-spec."ansi-styles"."~0.1.0" = + self.by-version."ansi-styles"."0.1.2"; + by-version."ansi-styles"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "ansi-styles-0.1.2"; src = [ (fetchurl { @@ -257,14 +222,16 @@ }) ]; buildInputs = - (self.nativeDeps."ansi-styles"."~0.1.0" or []); + (self.nativeDeps."ansi-styles" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ansi-styles" ]; }; - full."ansi-styles"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."ansi-styles"."~0.2.0" = + self.by-version."ansi-styles"."0.2.0"; + by-version."ansi-styles"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "ansi-styles-0.2.0"; src = [ (fetchurl { @@ -273,14 +240,16 @@ }) ]; buildInputs = - (self.nativeDeps."ansi-styles"."~0.2.0" or []); + (self.nativeDeps."ansi-styles" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ansi-styles" ]; }; - full."ansicolors"."~0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."ansicolors"."~0.2.1" = + self.by-version."ansicolors"."0.2.1"; + by-version."ansicolors"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "ansicolors-0.2.1"; src = [ (fetchurl { @@ -289,14 +258,16 @@ }) ]; buildInputs = - (self.nativeDeps."ansicolors"."~0.2.1" or []); + (self.nativeDeps."ansicolors" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ansicolors" ]; }; - full."apparatus".">= 0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."apparatus".">= 0.0.4" = + self.by-version."apparatus"."0.0.7"; + by-version."apparatus"."0.0.7" = lib.makeOverridable self.buildNodePackage { name = "apparatus-0.0.7"; src = [ (fetchurl { @@ -305,15 +276,17 @@ }) ]; buildInputs = - (self.nativeDeps."apparatus".">= 0.0.4" or []); + (self.nativeDeps."apparatus" or []); deps = [ - self.full."sylvester".">= 0.0.8" + self.by-version."sylvester"."0.0.21" ]; peerDependencies = [ ]; passthru.names = [ "apparatus" ]; }; - full."archiver"."~0.4.6" = lib.makeOverridable self.buildNodePackage { + by-spec."archiver"."~0.4.6" = + self.by-version."archiver"."0.4.10"; + by-version."archiver"."0.4.10" = lib.makeOverridable self.buildNodePackage { name = "archiver-0.4.10"; src = [ (fetchurl { @@ -322,16 +295,18 @@ }) ]; buildInputs = - (self.nativeDeps."archiver"."~0.4.6" or []); + (self.nativeDeps."archiver" or []); deps = [ - self.full."readable-stream"."~1.0.2" - self.full."iconv-lite"."~0.2.11" + self.by-version."readable-stream"."1.0.17" + self.by-version."iconv-lite"."0.2.11" ]; peerDependencies = [ ]; passthru.names = [ "archiver" ]; }; - full."archy"."0" = lib.makeOverridable self.buildNodePackage { + by-spec."archy"."0" = + self.by-version."archy"."0.0.2"; + by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "archy-0.0.2"; src = [ (fetchurl { @@ -340,30 +315,18 @@ }) ]; buildInputs = - (self.nativeDeps."archy"."0" or []); + (self.nativeDeps."archy" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "archy" ]; }; - full."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "archy-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; - sha1 = "910f43bf66141fc335564597abc189df44b3d35e"; - }) - ]; - buildInputs = - (self.nativeDeps."archy"."0.0.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "archy" ]; - }; - full."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { + by-spec."archy"."0.0.2" = + self.by-version."archy"."0.0.2"; + by-spec."argparse"."0.1.15" = + self.by-version."argparse"."0.1.15"; + by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { name = "argparse-0.1.15"; src = [ (fetchurl { @@ -372,34 +335,20 @@ }) ]; buildInputs = - (self.nativeDeps."argparse"."0.1.15" or []); + (self.nativeDeps."argparse" or []); deps = [ - self.full."underscore"."~1.4.3" - self.full."underscore.string"."~2.3.1" + self.by-version."underscore"."1.4.4" + self.by-version."underscore.string"."2.3.3" ]; peerDependencies = [ ]; passthru.names = [ "argparse" ]; }; - full."argparse"."~ 0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "argparse-0.1.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; - sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; - }) - ]; - buildInputs = - (self.nativeDeps."argparse"."~ 0.1.11" or []); - deps = [ - self.full."underscore"."~1.4.3" - self.full."underscore.string"."~2.3.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "argparse" ]; - }; - full."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + by-spec."argparse"."~ 0.1.11" = + self.by-version."argparse"."0.1.15"; + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { name = "asn1-0.1.11"; src = [ (fetchurl { @@ -408,14 +357,16 @@ }) ]; buildInputs = - (self.nativeDeps."asn1"."0.1.11" or []); + (self.nativeDeps."asn1" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "asn1" ]; }; - full."assert"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."assert"."*" = + self.by-version."assert"."0.4.9"; + by-version."assert"."0.4.9" = lib.makeOverridable self.buildNodePackage { name = "assert-0.4.9"; src = [ (fetchurl { @@ -424,16 +375,18 @@ }) ]; buildInputs = - (self.nativeDeps."assert"."*" or []); + (self.nativeDeps."assert" or []); deps = [ - self.full."util".">= 0.4.9" + self.by-version."util"."0.4.9" ]; peerDependencies = [ ]; passthru.names = [ "assert" ]; }; - "assert" = self.full."assert"."*"; - full."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + "assert" = self.by-version."assert"."0.4.9"; + by-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "assert-plus-0.1.2"; src = [ (fetchurl { @@ -442,14 +395,16 @@ }) ]; buildInputs = - (self.nativeDeps."assert-plus"."0.1.2" or []); + (self.nativeDeps."assert-plus" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "assert-plus" ]; }; - full."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."assertion-error"."1.0.0" = + self.by-version."assertion-error"."1.0.0"; + by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "assertion-error-1.0.0"; src = [ (fetchurl { @@ -458,14 +413,16 @@ }) ]; buildInputs = - (self.nativeDeps."assertion-error"."1.0.0" or []); + (self.nativeDeps."assertion-error" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "assertion-error" ]; }; - full."async"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."async"."*" = + self.by-version."async"."0.2.9"; + by-version."async"."0.2.9" = lib.makeOverridable self.buildNodePackage { name = "async-0.2.9"; src = [ (fetchurl { @@ -474,15 +431,17 @@ }) ]; buildInputs = - (self.nativeDeps."async"."*" or []); + (self.nativeDeps."async" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "async" ]; }; - "async" = self.full."async"."*"; - full."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { + "async" = self.by-version."async"."0.2.9"; + by-spec."async"."0.1.15" = + self.by-version."async"."0.1.15"; + by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage { name = "async-0.1.15"; src = [ (fetchurl { @@ -491,14 +450,16 @@ }) ]; buildInputs = - (self.nativeDeps."async"."0.1.15" or []); + (self.nativeDeps."async" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "async" ]; }; - full."async"."0.1.22" = lib.makeOverridable self.buildNodePackage { + by-spec."async"."0.1.22" = + self.by-version."async"."0.1.22"; + by-version."async"."0.1.22" = lib.makeOverridable self.buildNodePackage { name = "async-0.1.22"; src = [ (fetchurl { @@ -507,179 +468,73 @@ }) ]; buildInputs = - (self.nativeDeps."async"."0.1.22" or []); + (self.nativeDeps."async" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "async" ]; }; - full."async"."0.1.x" = lib.makeOverridable self.buildNodePackage { - name = "async-0.1.22"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; - sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."0.1.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."0.2.9" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."0.2.x" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."0.2.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."~0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "async-0.1.22"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; - sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."~0.1.22" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."~0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."~0.2.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."~0.2.7" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."~0.2.7" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."~0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."~0.2.8" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."async"."~0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }) - ]; - buildInputs = - (self.nativeDeps."async"."~0.2.9" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.9.0"; + by-spec."async"."0.1.x" = + self.by-version."async"."0.1.22"; + by-spec."async"."0.2.9" = + self.by-version."async"."0.2.9"; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.9"; + by-spec."async"."~0.1.22" = + self.by-version."async"."0.1.22"; + by-spec."async"."~0.2.6" = + self.by-version."async"."0.2.9"; + by-spec."async"."~0.2.7" = + self.by-version."async"."0.2.9"; + by-spec."async"."~0.2.8" = + self.by-version."async"."0.2.9"; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.9"; + by-spec."aws-sdk"."*" = + self.by-version."aws-sdk"."2.0.0-rc1"; + by-version."aws-sdk"."2.0.0-rc1" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.0-rc1"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.9.0.tgz"; - sha1 = "b4b0c2c954d07c40fa036447fae63181b4f83770"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc1.tgz"; + sha1 = "8f3b045ffa2050695a692f12ea76eff6d01a2349"; }) ]; buildInputs = - (self.nativeDeps."aws-sdk"."*" or []); + (self.nativeDeps."aws-sdk" or []); deps = [ - self.full."xml2js"."0.2.4" - self.full."xmlbuilder"."*" + self.by-version."xml2js"."0.2.4" + self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.full."aws-sdk"."*"; - full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.9.0"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1"; + by-spec."aws-sdk".">=1.2.0 <2" = + self.by-version."aws-sdk"."1.10.0"; + by-version."aws-sdk"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.10.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.9.0.tgz"; - sha1 = "b4b0c2c954d07c40fa036447fae63181b4f83770"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.10.0.tgz"; + sha1 = "a9759f3c5533c215e3747f0060fc5c2ced9ca9ce"; }) ]; buildInputs = - (self.nativeDeps."aws-sdk".">=1.2.0 <2" or []); + (self.nativeDeps."aws-sdk" or []); deps = [ - self.full."xml2js"."0.2.4" - self.full."xmlbuilder"."*" + self.by-version."xml2js"."0.2.4" + self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "aws-sdk" ]; }; - full."aws-sign"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."aws-sign"."~0.2.0" = + self.by-version."aws-sign"."0.2.0"; + by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "aws-sign-0.2.0"; src = [ (fetchurl { @@ -688,14 +543,16 @@ }) ]; buildInputs = - (self.nativeDeps."aws-sign"."~0.2.0" or []); + (self.nativeDeps."aws-sign" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "aws-sign" ]; }; - full."aws-sign"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."aws-sign"."~0.3.0" = + self.by-version."aws-sign"."0.3.0"; + by-version."aws-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "aws-sign-0.3.0"; src = [ (fetchurl { @@ -704,14 +561,16 @@ }) ]; buildInputs = - (self.nativeDeps."aws-sign"."~0.3.0" or []); + (self.nativeDeps."aws-sign" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "aws-sign" ]; }; - full."backbone"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."backbone"."*" = + self.by-version."backbone"."1.1.0"; + by-version."backbone"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "backbone-1.1.0"; src = [ (fetchurl { @@ -720,16 +579,18 @@ }) ]; buildInputs = - (self.nativeDeps."backbone"."*" or []); + (self.nativeDeps."backbone" or []); deps = [ - self.full."underscore".">=1.4.3" + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "backbone" ]; }; - "backbone" = self.full."backbone"."*"; - full."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage { + "backbone" = self.by-version."backbone"."1.1.0"; + by-spec."backoff"."2.1.0" = + self.by-version."backoff"."2.1.0"; + by-version."backoff"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "backoff-2.1.0"; src = [ (fetchurl { @@ -738,14 +599,16 @@ }) ]; buildInputs = - (self.nativeDeps."backoff"."2.1.0" or []); + (self.nativeDeps."backoff" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "backoff" ]; }; - full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."base64id"."0.1.0" = + self.by-version."base64id"."0.1.0"; + by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "base64id-0.1.0"; src = [ (fetchurl { @@ -754,14 +617,16 @@ }) ]; buildInputs = - (self.nativeDeps."base64id"."0.1.0" or []); + (self.nativeDeps."base64id" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "base64id" ]; }; - full."bcrypt"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."bcrypt"."*" = + self.by-version."bcrypt"."0.7.7"; + by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage { name = "bcrypt-0.7.7"; src = [ (fetchurl { @@ -770,16 +635,18 @@ }) ]; buildInputs = - (self.nativeDeps."bcrypt"."*" or []); + (self.nativeDeps."bcrypt" or []); deps = [ - self.full."bindings"."1.0.0" + self.by-version."bindings"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "bcrypt" ]; }; - "bcrypt" = self.full."bcrypt"."*"; - full."binary"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + "bcrypt" = self.by-version."bcrypt"."0.7.7"; + by-spec."binary"."~0.3.0" = + self.by-version."binary"."0.3.0"; + by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "binary-0.3.0"; src = [ (fetchurl { @@ -788,16 +655,18 @@ }) ]; buildInputs = - (self.nativeDeps."binary"."~0.3.0" or []); + (self.nativeDeps."binary" or []); deps = [ - self.full."chainsaw"."~0.1.0" - self.full."buffers"."~0.1.1" + self.by-version."chainsaw"."0.1.0" + self.by-version."buffers"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "binary" ]; }; - full."bindings"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."bindings"."*" = + self.by-version."bindings"."1.1.1"; + by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "bindings-1.1.1"; src = [ (fetchurl { @@ -806,14 +675,16 @@ }) ]; buildInputs = - (self.nativeDeps."bindings"."*" or []); + (self.nativeDeps."bindings" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bindings" ]; }; - full."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bindings"."1.0.0" = + self.by-version."bindings"."1.0.0"; + by-version."bindings"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "bindings-1.0.0"; src = [ (fetchurl { @@ -822,14 +693,16 @@ }) ]; buildInputs = - (self.nativeDeps."bindings"."1.0.0" or []); + (self.nativeDeps."bindings" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bindings" ]; }; - full."block-stream"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { name = "block-stream-0.0.7"; src = [ (fetchurl { @@ -838,32 +711,19 @@ }) ]; buildInputs = - (self.nativeDeps."block-stream"."*" or []); + (self.nativeDeps."block-stream" or []); deps = [ - self.full."inherits"."~2.0.0" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "block-stream" ]; }; - full."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "block-stream-0.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; - }) - ]; - buildInputs = - (self.nativeDeps."block-stream"."0.0.7" or []); - deps = [ - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "block-stream" ]; - }; - full."blueimp-md5"."~1.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."block-stream"."0.0.7" = + self.by-version."block-stream"."0.0.7"; + by-spec."blueimp-md5"."~1.0.3" = + self.by-version."blueimp-md5"."1.0.3"; + by-version."blueimp-md5"."1.0.3" = lib.makeOverridable self.buildNodePackage { name = "blueimp-md5-1.0.3"; src = [ (fetchurl { @@ -872,14 +732,16 @@ }) ]; buildInputs = - (self.nativeDeps."blueimp-md5"."~1.0.3" or []); + (self.nativeDeps."blueimp-md5" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "blueimp-md5" ]; }; - full."boom"."0.3.x" = lib.makeOverridable self.buildNodePackage { + by-spec."boom"."0.3.x" = + self.by-version."boom"."0.3.8"; + by-version."boom"."0.3.8" = lib.makeOverridable self.buildNodePackage { name = "boom-0.3.8"; src = [ (fetchurl { @@ -888,15 +750,17 @@ }) ]; buildInputs = - (self.nativeDeps."boom"."0.3.x" or []); + (self.nativeDeps."boom" or []); deps = [ - self.full."hoek"."0.7.x" + self.by-version."hoek"."0.7.6" ]; peerDependencies = [ ]; passthru.names = [ "boom" ]; }; - full."boom"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "boom-0.4.2"; src = [ (fetchurl { @@ -905,15 +769,17 @@ }) ]; buildInputs = - (self.nativeDeps."boom"."0.4.x" or []); + (self.nativeDeps."boom" or []); deps = [ - self.full."hoek"."0.9.x" + self.by-version."hoek"."0.9.1" ]; peerDependencies = [ ]; passthru.names = [ "boom" ]; }; - full."bower"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."bower"."*" = + self.by-version."bower"."1.2.7"; + by-version."bower"."1.2.7" = lib.makeOverridable self.buildNodePackage { name = "bower-1.2.7"; src = [ (fetchurl { @@ -922,105 +788,56 @@ }) ]; buildInputs = - (self.nativeDeps."bower"."*" or []); + (self.nativeDeps."bower" or []); deps = [ - self.full."abbrev"."~1.0.4" - self.full."archy"."0.0.2" - self.full."bower-config"."~0.5.0" - self.full."bower-endpoint-parser"."~0.2.0" - self.full."bower-json"."~0.4.0" - self.full."bower-logger"."~0.2.1" - self.full."bower-registry-client"."~0.1.4" - self.full."cardinal"."~0.4.0" - self.full."chalk"."~0.2.0" - self.full."chmodr"."~0.1.0" - self.full."fstream"."~0.1.22" - self.full."fstream-ignore"."~0.0.6" - self.full."glob"."~3.2.1" - self.full."graceful-fs"."~2.0.0" - self.full."handlebars"."~1.0.11" - self.full."inquirer"."~0.3.0" - self.full."junk"."~0.2.0" - self.full."mkdirp"."~0.3.5" - self.full."mout"."~0.7.0" - self.full."nopt"."~2.1.1" - self.full."lru-cache"."~2.3.0" - self.full."open"."~0.0.3" - self.full."osenv"."0.0.3" - self.full."promptly"."~0.2.0" - self.full."q"."~0.9.2" - self.full."request"."~2.27.0" - self.full."request-progress"."~0.3.0" - self.full."retry"."~0.6.0" - self.full."rimraf"."~2.2.0" - self.full."semver"."~2.1.0" - self.full."stringify-object"."~0.1.4" - self.full."sudo-block"."~0.2.0" - self.full."tar"."~0.1.17" - self.full."tmp"."~0.0.20" - self.full."unzip"."~0.1.7" - self.full."update-notifier"."~0.1.3" - self.full."which"."~1.0.5" + 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.1" + self.by-version."bower-registry-client"."0.1.5" + self.by-version."cardinal"."0.4.2" + self.by-version."chalk"."0.2.1" + self.by-version."chmodr"."0.1.0" + self.by-version."fstream"."0.1.24" + self.by-version."fstream-ignore"."0.0.7" + self.by-version."glob"."3.2.6" + self.by-version."graceful-fs"."2.0.1" + self.by-version."handlebars"."1.0.12" + self.by-version."inquirer"."0.3.5" + self.by-version."junk"."0.2.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."mout"."0.7.1" + self.by-version."nopt"."2.1.2" + self.by-version."lru-cache"."2.3.1" + 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"."0.9.7" + self.by-version."request"."2.27.0" + self.by-version."request-progress"."0.3.1" + self.by-version."retry"."0.6.0" + self.by-version."rimraf"."2.2.2" + self.by-version."semver"."2.1.0" + self.by-version."stringify-object"."0.1.7" + self.by-version."sudo-block"."0.2.1" + self.by-version."tar"."0.1.18" + self.by-version."tmp"."0.0.21" + self.by-version."unzip"."0.1.9" + self.by-version."update-notifier"."0.1.7" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "bower" ]; }; - "bower" = self.full."bower"."*"; - full."bower".">=0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.2.7.tgz"; - sha1 = "5b0505c8192bd61a752a7cf8b718d1b3054cd554"; - }) - ]; - buildInputs = - (self.nativeDeps."bower".">=0.9.0" or []); - deps = [ - self.full."abbrev"."~1.0.4" - self.full."archy"."0.0.2" - self.full."bower-config"."~0.5.0" - self.full."bower-endpoint-parser"."~0.2.0" - self.full."bower-json"."~0.4.0" - self.full."bower-logger"."~0.2.1" - self.full."bower-registry-client"."~0.1.4" - self.full."cardinal"."~0.4.0" - self.full."chalk"."~0.2.0" - self.full."chmodr"."~0.1.0" - self.full."fstream"."~0.1.22" - self.full."fstream-ignore"."~0.0.6" - self.full."glob"."~3.2.1" - self.full."graceful-fs"."~2.0.0" - self.full."handlebars"."~1.0.11" - self.full."inquirer"."~0.3.0" - self.full."junk"."~0.2.0" - self.full."mkdirp"."~0.3.5" - self.full."mout"."~0.7.0" - self.full."nopt"."~2.1.1" - self.full."lru-cache"."~2.3.0" - self.full."open"."~0.0.3" - self.full."osenv"."0.0.3" - self.full."promptly"."~0.2.0" - self.full."q"."~0.9.2" - self.full."request"."~2.27.0" - self.full."request-progress"."~0.3.0" - self.full."retry"."~0.6.0" - self.full."rimraf"."~2.2.0" - self.full."semver"."~2.1.0" - self.full."stringify-object"."~0.1.4" - self.full."sudo-block"."~0.2.0" - self.full."tar"."~0.1.17" - self.full."tmp"."~0.0.20" - self.full."unzip"."~0.1.7" - self.full."update-notifier"."~0.1.3" - self.full."which"."~1.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bower" ]; - }; - full."bower-config"."~0.4.3" = lib.makeOverridable self.buildNodePackage { + "bower" = self.by-version."bower"."1.2.7"; + by-spec."bower".">=0.9.0" = + self.by-version."bower"."1.2.7"; + by-spec."bower-config"."~0.4.3" = + self.by-version."bower-config"."0.4.5"; + by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage { name = "bower-config-0.4.5"; src = [ (fetchurl { @@ -1029,18 +846,20 @@ }) ]; buildInputs = - (self.nativeDeps."bower-config"."~0.4.3" or []); + (self.nativeDeps."bower-config" or []); deps = [ - self.full."graceful-fs"."~2.0.0" - self.full."mout"."~0.6.0" - self.full."optimist"."~0.6.0" - self.full."osenv"."0.0.3" + self.by-version."graceful-fs"."2.0.1" + self.by-version."mout"."0.6.0" + self.by-version."optimist"."0.6.0" + self.by-version."osenv"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "bower-config" ]; }; - full."bower-config"."~0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bower-config"."~0.5.0" = + self.by-version."bower-config"."0.5.0"; + by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage { name = "bower-config-0.5.0"; src = [ (fetchurl { @@ -1049,18 +868,20 @@ }) ]; buildInputs = - (self.nativeDeps."bower-config"."~0.5.0" or []); + (self.nativeDeps."bower-config" or []); deps = [ - self.full."graceful-fs"."~2.0.0" - self.full."mout"."~0.6.0" - self.full."optimist"."~0.6.0" - self.full."osenv"."0.0.3" + self.by-version."graceful-fs"."2.0.1" + self.by-version."mout"."0.6.0" + self.by-version."optimist"."0.6.0" + self.by-version."osenv"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "bower-config" ]; }; - full."bower-endpoint-parser"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bower-endpoint-parser"."~0.2.0" = + self.by-version."bower-endpoint-parser"."0.2.1"; + by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "bower-endpoint-parser-0.2.1"; src = [ (fetchurl { @@ -1069,14 +890,16 @@ }) ]; buildInputs = - (self.nativeDeps."bower-endpoint-parser"."~0.2.0" or []); + (self.nativeDeps."bower-endpoint-parser" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bower-endpoint-parser" ]; }; - full."bower-json"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bower-json"."~0.4.0" = + self.by-version."bower-json"."0.4.0"; + by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage { name = "bower-json-0.4.0"; src = [ (fetchurl { @@ -1085,17 +908,19 @@ }) ]; buildInputs = - (self.nativeDeps."bower-json"."~0.4.0" or []); + (self.nativeDeps."bower-json" or []); deps = [ - self.full."deep-extend"."~0.2.5" - self.full."graceful-fs"."~2.0.0" - self.full."intersect"."~0.0.3" + self.by-version."deep-extend"."0.2.6" + self.by-version."graceful-fs"."2.0.1" + self.by-version."intersect"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "bower-json" ]; }; - full."bower-logger"."~0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."bower-logger"."~0.2.1" = + self.by-version."bower-logger"."0.2.1"; + by-version."bower-logger"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "bower-logger-0.2.1"; src = [ (fetchurl { @@ -1104,14 +929,16 @@ }) ]; buildInputs = - (self.nativeDeps."bower-logger"."~0.2.1" or []); + (self.nativeDeps."bower-logger" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bower-logger" ]; }; - full."bower-registry-client"."~0.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."bower-registry-client"."~0.1.4" = + self.by-version."bower-registry-client"."0.1.5"; + by-version."bower-registry-client"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "bower-registry-client-0.1.5"; src = [ (fetchurl { @@ -1120,22 +947,24 @@ }) ]; buildInputs = - (self.nativeDeps."bower-registry-client"."~0.1.4" or []); + (self.nativeDeps."bower-registry-client" or []); deps = [ - self.full."async"."~0.2.8" - self.full."bower-config"."~0.4.3" - self.full."graceful-fs"."~2.0.0" - self.full."lru-cache"."~2.3.0" - self.full."request"."~2.27.0" - self.full."request-replay"."~0.2.0" - self.full."rimraf"."~2.2.0" - self.full."mkdirp"."~0.3.5" + self.by-version."async"."0.2.9" + self.by-version."bower-config"."0.4.5" + self.by-version."graceful-fs"."2.0.1" + self.by-version."lru-cache"."2.3.1" + self.by-version."request"."2.27.0" + self.by-version."request-replay"."0.2.0" + self.by-version."rimraf"."2.2.2" + self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ ]; passthru.names = [ "bower-registry-client" ]; }; - full."broadway"."0.2.7" = lib.makeOverridable self.buildNodePackage { + by-spec."broadway"."0.2.7" = + self.by-version."broadway"."0.2.7"; + by-version."broadway"."0.2.7" = lib.makeOverridable self.buildNodePackage { name = "broadway-0.2.7"; src = [ (fetchurl { @@ -1144,40 +973,23 @@ }) ]; buildInputs = - (self.nativeDeps."broadway"."0.2.7" or []); + (self.nativeDeps."broadway" or []); deps = [ - self.full."cliff"."0.1.8" - self.full."eventemitter2"."0.4.11" - self.full."nconf"."0.6.7" - self.full."winston"."0.6.2" - self.full."utile"."0.1.7" + self.by-version."cliff"."0.1.8" + self.by-version."eventemitter2"."0.4.11" + self.by-version."nconf"."0.6.7" + self.by-version."winston"."0.6.2" + self.by-version."utile"."0.1.7" ]; peerDependencies = [ ]; passthru.names = [ "broadway" ]; }; - full."broadway"."0.2.x" = lib.makeOverridable self.buildNodePackage { - name = "broadway-0.2.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz"; - sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762"; - }) - ]; - buildInputs = - (self.nativeDeps."broadway"."0.2.x" or []); - deps = [ - self.full."cliff"."0.1.8" - self.full."eventemitter2"."0.4.11" - self.full."nconf"."0.6.7" - self.full."winston"."0.6.2" - self.full."utile"."0.1.7" - ]; - peerDependencies = [ - ]; - passthru.names = [ "broadway" ]; - }; - full."browserchannel"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."broadway"."0.2.x" = + self.by-version."broadway"."0.2.7"; + by-spec."browserchannel"."*" = + self.by-version."browserchannel"."1.0.8"; + by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "browserchannel-1.0.8"; src = [ (fetchurl { @@ -1186,18 +998,20 @@ }) ]; buildInputs = - (self.nativeDeps."browserchannel"."*" or []); + (self.nativeDeps."browserchannel" or []); deps = [ - self.full."hat"."*" - self.full."connect"."~2" - self.full."request"."~2" + self.by-version."hat"."0.0.3" + self.by-version."connect"."2.11.0" + self.by-version."request"."2.27.0" ]; peerDependencies = [ ]; passthru.names = [ "browserchannel" ]; }; - "browserchannel" = self.full."browserchannel"."*"; - full."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { + "browserchannel" = self.by-version."browserchannel"."1.0.8"; + by-spec."bson"."0.1.8" = + self.by-version."bson"."0.1.8"; + by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "bson-0.1.8"; src = [ (fetchurl { @@ -1206,14 +1020,16 @@ }) ]; buildInputs = - (self.nativeDeps."bson"."0.1.8" or []); + (self.nativeDeps."bson" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bson" ]; }; - full."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."bson"."0.2.2" = + self.by-version."bson"."0.2.2"; + by-version."bson"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "bson-0.2.2"; src = [ (fetchurl { @@ -1222,14 +1038,16 @@ }) ]; buildInputs = - (self.nativeDeps."bson"."0.2.2" or []); + (self.nativeDeps."bson" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bson" ]; }; - full."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."buffer-crc32"."0.1.1" = + self.by-version."buffer-crc32"."0.1.1"; + by-version."buffer-crc32"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "buffer-crc32-0.1.1"; src = [ (fetchurl { @@ -1238,14 +1056,16 @@ }) ]; buildInputs = - (self.nativeDeps."buffer-crc32"."0.1.1" or []); + (self.nativeDeps."buffer-crc32" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "buffer-crc32" ]; }; - full."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."buffer-crc32"."0.2.1" = + self.by-version."buffer-crc32"."0.2.1"; + by-version."buffer-crc32"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "buffer-crc32-0.2.1"; src = [ (fetchurl { @@ -1254,30 +1074,18 @@ }) ]; buildInputs = - (self.nativeDeps."buffer-crc32"."0.2.1" or []); + (self.nativeDeps."buffer-crc32" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "buffer-crc32" ]; }; - full."buffer-crc32"."~0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-crc32"."~0.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffer-crc32" ]; - }; - full."buffers"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."buffer-crc32"."~0.2.1" = + self.by-version."buffer-crc32"."0.2.1"; + by-spec."buffers"."~0.1.1" = + self.by-version."buffers"."0.1.1"; + by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "buffers-0.1.1"; src = [ (fetchurl { @@ -1286,14 +1094,16 @@ }) ]; buildInputs = - (self.nativeDeps."buffers"."~0.1.1" or []); + (self.nativeDeps."buffers" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "buffers" ]; }; - full."buffertools"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."buffertools"."*" = + self.by-version."buffertools"."1.1.1"; + by-version."buffertools"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "buffertools-1.1.1"; src = [ (fetchurl { @@ -1302,31 +1112,19 @@ }) ]; buildInputs = - (self.nativeDeps."buffertools"."*" or []); + (self.nativeDeps."buffertools" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "buffertools" ]; }; - "buffertools" = self.full."buffertools"."*"; - full."buffertools".">=1.1.1 <2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "buffertools-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; - sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; - }) - ]; - buildInputs = - (self.nativeDeps."buffertools".">=1.1.1 <2.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffertools" ]; - }; - full."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { + "buffertools" = self.by-version."buffertools"."1.1.1"; + by-spec."buffertools".">=1.1.1 <2.0.0" = + self.by-version."buffertools"."1.1.1"; + by-spec."bunyan"."0.21.1" = + self.by-version."bunyan"."0.21.1"; + by-version."bunyan"."0.21.1" = lib.makeOverridable self.buildNodePackage { name = "bunyan-0.21.1"; src = [ (fetchurl { @@ -1335,16 +1133,18 @@ }) ]; buildInputs = - (self.nativeDeps."bunyan"."0.21.1" or []); + (self.nativeDeps."bunyan" or []); deps = [ - self.full."mv"."0.0.5" - self.full."dtrace-provider"."0.2.8" + self.by-version."mv"."0.0.5" + self.by-version."dtrace-provider"."0.2.8" ]; peerDependencies = [ ]; passthru.names = [ "bunyan" ]; }; - full."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bytes"."0.2.0" = + self.by-version."bytes"."0.2.0"; + by-version."bytes"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "bytes-0.2.0"; src = [ (fetchurl { @@ -1353,14 +1153,34 @@ }) ]; buildInputs = - (self.nativeDeps."bytes"."0.2.0" or []); + (self.nativeDeps."bytes" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "bytes" ]; }; - full."cardinal"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."bytes"."0.2.1" = + self.by-version."bytes"."0.2.1"; + by-version."bytes"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "bytes-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; + }) + ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; + by-spec."cardinal"."~0.4.0" = + self.by-version."cardinal"."0.4.2"; + by-version."cardinal"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "cardinal-0.4.2"; src = [ (fetchurl { @@ -1369,16 +1189,18 @@ }) ]; buildInputs = - (self.nativeDeps."cardinal"."~0.4.0" or []); + (self.nativeDeps."cardinal" or []); deps = [ - self.full."redeyed"."~0.4.0" - self.full."ansicolors"."~0.2.1" + self.by-version."redeyed"."0.4.2" + self.by-version."ansicolors"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "cardinal" ]; }; - full."chai"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."chai"."*" = + self.by-version."chai"."1.8.1"; + by-version."chai"."1.8.1" = lib.makeOverridable self.buildNodePackage { name = "chai-1.8.1"; src = [ (fetchurl { @@ -1387,17 +1209,19 @@ }) ]; buildInputs = - (self.nativeDeps."chai"."*" or []); + (self.nativeDeps."chai" or []); deps = [ - self.full."assertion-error"."1.0.0" - self.full."deep-eql"."0.1.3" + self.by-version."assertion-error"."1.0.0" + self.by-version."deep-eql"."0.1.3" ]; peerDependencies = [ ]; passthru.names = [ "chai" ]; }; - "chai" = self.full."chai"."*"; - full."chainsaw"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + "chai" = self.by-version."chai"."1.8.1"; + by-spec."chainsaw"."~0.1.0" = + self.by-version."chainsaw"."0.1.0"; + by-version."chainsaw"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "chainsaw-0.1.0"; src = [ (fetchurl { @@ -1406,15 +1230,17 @@ }) ]; buildInputs = - (self.nativeDeps."chainsaw"."~0.1.0" or []); + (self.nativeDeps."chainsaw" or []); deps = [ - self.full."traverse".">=0.3.0 <0.4" + self.by-version."traverse"."0.3.9" ]; peerDependencies = [ ]; passthru.names = [ "chainsaw" ]; }; - full."chalk"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."chalk"."~0.1.1" = + self.by-version."chalk"."0.1.1"; + by-version."chalk"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "chalk-0.1.1"; src = [ (fetchurl { @@ -1423,34 +1249,18 @@ }) ]; buildInputs = - (self.nativeDeps."chalk"."~0.1.0" or []); + (self.nativeDeps."chalk" or []); deps = [ - self.full."has-color"."~0.1.0" - self.full."ansi-styles"."~0.1.0" + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "chalk" ]; }; - full."chalk"."~0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "chalk-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-0.1.1.tgz"; - sha1 = "fe6d90ae2c270424720c87ed92d36490b7d36ea0"; - }) - ]; - buildInputs = - (self.nativeDeps."chalk"."~0.1.1" or []); - deps = [ - self.full."has-color"."~0.1.0" - self.full."ansi-styles"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "chalk" ]; - }; - full."chalk"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."chalk"."~0.2.0" = + self.by-version."chalk"."0.2.1"; + by-version."chalk"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "chalk-0.2.1"; src = [ (fetchurl { @@ -1459,16 +1269,20 @@ }) ]; buildInputs = - (self.nativeDeps."chalk"."~0.2.0" or []); + (self.nativeDeps."chalk" or []); deps = [ - self.full."has-color"."~0.1.0" - self.full."ansi-styles"."~0.2.0" + self.by-version."has-color"."0.1.1" + self.by-version."ansi-styles"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "chalk" ]; }; - full."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."chalk"."~0.2.1" = + self.by-version."chalk"."0.2.1"; + by-spec."character-parser"."1.2.0" = + self.by-version."character-parser"."1.2.0"; + by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage { name = "character-parser-1.2.0"; src = [ (fetchurl { @@ -1477,14 +1291,16 @@ }) ]; buildInputs = - (self.nativeDeps."character-parser"."1.2.0" or []); + (self.nativeDeps."character-parser" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "character-parser" ]; }; - full."cheerio"."~0.10.8" = lib.makeOverridable self.buildNodePackage { + by-spec."cheerio"."~0.10.8" = + self.by-version."cheerio"."0.10.8"; + by-version."cheerio"."0.10.8" = lib.makeOverridable self.buildNodePackage { name = "cheerio-0.10.8"; src = [ (fetchurl { @@ -1493,18 +1309,20 @@ }) ]; buildInputs = - (self.nativeDeps."cheerio"."~0.10.8" or []); + (self.nativeDeps."cheerio" or []); deps = [ - self.full."cheerio-select"."*" - self.full."htmlparser2"."2.x" - self.full."underscore"."~1.4" - self.full."entities"."0.x" + self.by-version."cheerio-select"."0.0.3" + self.by-version."htmlparser2"."2.6.0" + self.by-version."underscore"."1.4.4" + self.by-version."entities"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "cheerio" ]; }; - full."cheerio"."~0.12.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cheerio"."~0.12.0" = + self.by-version."cheerio"."0.12.3"; + by-version."cheerio"."0.12.3" = lib.makeOverridable self.buildNodePackage { name = "cheerio-0.12.3"; src = [ (fetchurl { @@ -1513,38 +1331,22 @@ }) ]; buildInputs = - (self.nativeDeps."cheerio"."~0.12.0" or []); + (self.nativeDeps."cheerio" or []); deps = [ - self.full."cheerio-select"."*" - self.full."htmlparser2"."3.1.4" - self.full."underscore"."~1.4" - self.full."entities"."0.x" + self.by-version."cheerio-select"."0.0.3" + self.by-version."htmlparser2"."3.1.4" + self.by-version."underscore"."1.4.4" + self.by-version."entities"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "cheerio" ]; }; - full."cheerio"."~0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.12.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.3.tgz"; - sha1 = "8eb05ace0a3fc72d9d9ce0b5d364fe8bb565d7fa"; - }) - ]; - buildInputs = - (self.nativeDeps."cheerio"."~0.12.1" or []); - deps = [ - self.full."cheerio-select"."*" - self.full."htmlparser2"."3.1.4" - self.full."underscore"."~1.4" - self.full."entities"."0.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cheerio" ]; - }; - full."cheerio-select"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."cheerio"."~0.12.1" = + self.by-version."cheerio"."0.12.3"; + by-spec."cheerio-select"."*" = + self.by-version."cheerio-select"."0.0.3"; + by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "cheerio-select-0.0.3"; src = [ (fetchurl { @@ -1553,15 +1355,17 @@ }) ]; buildInputs = - (self.nativeDeps."cheerio-select"."*" or []); + (self.nativeDeps."cheerio-select" or []); deps = [ - self.full."CSSselect"."0.x" + self.by-version."CSSselect"."0.3.11" ]; peerDependencies = [ ]; passthru.names = [ "cheerio-select" ]; }; - full."child-process-close"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."child-process-close"."~0.1.1" = + self.by-version."child-process-close"."0.1.1"; + by-version."child-process-close"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "child-process-close-0.1.1"; src = [ (fetchurl { @@ -1570,14 +1374,16 @@ }) ]; buildInputs = - (self.nativeDeps."child-process-close"."~0.1.1" or []); + (self.nativeDeps."child-process-close" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "child-process-close" ]; }; - full."chmodr"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."chmodr"."~0.1.0" = + self.by-version."chmodr"."0.1.0"; + by-version."chmodr"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "chmodr-0.1.0"; src = [ (fetchurl { @@ -1586,30 +1392,34 @@ }) ]; buildInputs = - (self.nativeDeps."chmodr"."~0.1.0" or []); + (self.nativeDeps."chmodr" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "chmodr" ]; }; - full."chokidar"."~0.6" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.6.3"; + by-spec."chokidar"."~0.7.0" = + self.by-version."chokidar"."0.7.0"; + by-version."chokidar"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.6.3.tgz"; - sha1 = "e85968fa235f21773d388c617af085bf2104425a"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.7.0.tgz"; + sha1 = "bfaa9bdf30c0921dbe0a98bd93a3e06a5d5814e5"; }) ]; buildInputs = - (self.nativeDeps."chokidar"."~0.6" or []); + (self.nativeDeps."chokidar" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "chokidar" ]; }; - full."chownr"."0" = lib.makeOverridable self.buildNodePackage { + by-spec."chownr"."0" = + self.by-version."chownr"."0.0.1"; + by-version."chownr"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "chownr-0.0.1"; src = [ (fetchurl { @@ -1618,31 +1428,54 @@ }) ]; buildInputs = - (self.nativeDeps."chownr"."0" or []); + (self.nativeDeps."chownr" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "chownr" ]; }; - full."clean-css"."~1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-1.1.3"; + by-spec."clean-css"."1.0.x" = + self.by-version."clean-css"."1.0.12"; + by-version."clean-css"."1.0.12" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-1.0.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-1.1.3.tgz"; - sha1 = "5442cbf45643e09bdcfae25f2b5d8eb36e168ae1"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-1.0.12.tgz"; + sha1 = "e6e0d977860466363d9110a17423d27cd6874300"; }) ]; buildInputs = - (self.nativeDeps."clean-css"."~1.1.1" or []); + (self.nativeDeps."clean-css" or []); deps = [ - self.full."commander"."2.0.x" + self.by-version."commander"."1.3.2" ]; peerDependencies = [ ]; passthru.names = [ "clean-css" ]; }; - full."cli"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."clean-css"."~2.0.0" = + self.by-version."clean-css"."2.0.0"; + by-version."clean-css"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.0.tgz"; + sha1 = "ece63c9ad25e3813c89a95566795a3d0a2ff0dac"; + }) + ]; + buildInputs = + (self.nativeDeps."clean-css" or []); + deps = [ + self.by-version."commander"."2.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "clean-css" ]; + }; + by-spec."cli"."0.4.x" = + self.by-version."cli"."0.4.5"; + by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { name = "cli-0.4.5"; src = [ (fetchurl { @@ -1651,15 +1484,17 @@ }) ]; buildInputs = - (self.nativeDeps."cli"."0.4.x" or []); + (self.nativeDeps."cli" or []); deps = [ - self.full."glob".">= 3.1.4" + self.by-version."glob"."3.2.6" ]; peerDependencies = [ ]; passthru.names = [ "cli" ]; }; - full."cli-color"."~0.2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."cli-color"."~0.2.2" = + self.by-version."cli-color"."0.2.3"; + by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage { name = "cli-color-0.2.3"; src = [ (fetchurl { @@ -1668,16 +1503,18 @@ }) ]; buildInputs = - (self.nativeDeps."cli-color"."~0.2.2" or []); + (self.nativeDeps."cli-color" or []); deps = [ - self.full."es5-ext"."~0.9.2" - self.full."memoizee"."~0.2.5" + self.by-version."es5-ext"."0.9.2" + self.by-version."memoizee"."0.2.6" ]; peerDependencies = [ ]; passthru.names = [ "cli-color" ]; }; - full."cli-table"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cli-table"."~0.2.0" = + self.by-version."cli-table"."0.2.0"; + by-version."cli-table"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "cli-table-0.2.0"; src = [ (fetchurl { @@ -1686,15 +1523,17 @@ }) ]; buildInputs = - (self.nativeDeps."cli-table"."~0.2.0" or []); + (self.nativeDeps."cli-table" or []); deps = [ - self.full."colors"."0.3.0" + self.by-version."colors"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "cli-table" ]; }; - full."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { + by-spec."cliff"."0.1.8" = + self.by-version."cliff"."0.1.8"; + by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "cliff-0.1.8"; src = [ (fetchurl { @@ -1703,17 +1542,19 @@ }) ]; buildInputs = - (self.nativeDeps."cliff"."0.1.8" or []); + (self.nativeDeps."cliff" or []); deps = [ - self.full."colors"."0.x.x" - self.full."eyes"."0.1.x" - self.full."winston"."0.6.x" + self.by-version."colors"."0.6.2" + self.by-version."eyes"."0.1.8" + self.by-version."winston"."0.6.2" ]; peerDependencies = [ ]; passthru.names = [ "cliff" ]; }; - full."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { + by-spec."clone"."0.1.5" = + self.by-version."clone"."0.1.5"; + by-version."clone"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "clone-0.1.5"; src = [ (fetchurl { @@ -1722,14 +1563,16 @@ }) ]; buildInputs = - (self.nativeDeps."clone"."0.1.5" or []); + (self.nativeDeps."clone" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "clone" ]; }; - full."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage { + by-spec."clone"."0.1.6" = + self.by-version."clone"."0.1.6"; + by-version."clone"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "clone-0.1.6"; src = [ (fetchurl { @@ -1738,32 +1581,16 @@ }) ]; buildInputs = - (self.nativeDeps."clone"."0.1.6" or []); + (self.nativeDeps."clone" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "clone" ]; }; - full."cmd-shim"."~1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "cmd-shim-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.0.1.tgz"; - sha1 = "75e917c2185240854718c686346770640083d7bc"; - }) - ]; - buildInputs = - (self.nativeDeps."cmd-shim"."~1.0.1" or []); - deps = [ - self.full."mkdirp"."~0.3.3" - self.full."graceful-fs"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cmd-shim" ]; - }; - full."cmd-shim"."~1.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cmd-shim"."~1.1.1" = + self.by-version."cmd-shim"."1.1.1"; + by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "cmd-shim-1.1.1"; src = [ (fetchurl { @@ -1772,16 +1599,18 @@ }) ]; buildInputs = - (self.nativeDeps."cmd-shim"."~1.1.0" or []); + (self.nativeDeps."cmd-shim" or []); deps = [ - self.full."mkdirp"."~0.3.3" - self.full."graceful-fs"."2" + self.by-version."mkdirp"."0.3.5" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "cmd-shim" ]; }; - full."coffee-script"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."coffee-script"."*" = + self.by-version."coffee-script"."1.6.3"; + by-version."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-1.6.3"; src = [ (fetchurl { @@ -1790,63 +1619,23 @@ }) ]; buildInputs = - (self.nativeDeps."coffee-script"."*" or []); + (self.nativeDeps."coffee-script" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "coffee-script" ]; }; - "coffee-script" = self.full."coffee-script"."*"; - full."coffee-script"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-1.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script"."1.6.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script" ]; - }; - full."coffee-script".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-1.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script".">= 0.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script" ]; - }; - full."coffee-script".">=1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-1.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script".">=1.2.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script" ]; - }; - full."coffee-script"."~1.3.3" = lib.makeOverridable self.buildNodePackage { + "coffee-script" = self.by-version."coffee-script"."1.6.3"; + by-spec."coffee-script"."1.6.3" = + self.by-version."coffee-script"."1.6.3"; + by-spec."coffee-script".">= 0.0.1" = + self.by-version."coffee-script"."1.6.3"; + by-spec."coffee-script".">=1.2.0" = + self.by-version."coffee-script"."1.6.3"; + by-spec."coffee-script"."~1.3.3" = + self.by-version."coffee-script"."1.3.3"; + by-version."coffee-script"."1.3.3" = lib.makeOverridable self.buildNodePackage { name = "coffee-script-1.3.3"; src = [ (fetchurl { @@ -1855,30 +1644,18 @@ }) ]; buildInputs = - (self.nativeDeps."coffee-script"."~1.3.3" or []); + (self.nativeDeps."coffee-script" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "coffee-script" ]; }; - full."coffee-script"."~1.6" = lib.makeOverridable self.buildNodePackage { - name = "coffee-script-1.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; - }) - ]; - buildInputs = - (self.nativeDeps."coffee-script"."~1.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "coffee-script" ]; - }; - full."color"."~0.4.4" = lib.makeOverridable self.buildNodePackage { + by-spec."coffee-script"."~1.6" = + self.by-version."coffee-script"."1.6.3"; + by-spec."color"."~0.4.4" = + self.by-version."color"."0.4.4"; + by-version."color"."0.4.4" = lib.makeOverridable self.buildNodePackage { name = "color-0.4.4"; src = [ (fetchurl { @@ -1887,16 +1664,18 @@ }) ]; buildInputs = - (self.nativeDeps."color"."~0.4.4" or []); + (self.nativeDeps."color" or []); deps = [ - self.full."color-convert"."0.2.x" - self.full."color-string"."0.1.x" + self.by-version."color-convert"."0.2.1" + self.by-version."color-string"."0.1.2" ]; peerDependencies = [ ]; passthru.names = [ "color" ]; }; - full."color-convert"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."color-convert"."0.2.x" = + self.by-version."color-convert"."0.2.1"; + by-version."color-convert"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "color-convert-0.2.1"; src = [ (fetchurl { @@ -1905,14 +1684,16 @@ }) ]; buildInputs = - (self.nativeDeps."color-convert"."0.2.x" or []); + (self.nativeDeps."color-convert" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "color-convert" ]; }; - full."color-string"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."color-string"."0.1.x" = + self.by-version."color-string"."0.1.2"; + by-version."color-string"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "color-string-0.1.2"; src = [ (fetchurl { @@ -1921,15 +1702,17 @@ }) ]; buildInputs = - (self.nativeDeps."color-string"."0.1.x" or []); + (self.nativeDeps."color-string" or []); deps = [ - self.full."color-convert"."0.2.x" + self.by-version."color-convert"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "color-string" ]; }; - full."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."colors"."0.3.0" = + self.by-version."colors"."0.3.0"; + by-version."colors"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "colors-0.3.0"; src = [ (fetchurl { @@ -1938,14 +1721,16 @@ }) ]; buildInputs = - (self.nativeDeps."colors"."0.3.0" or []); + (self.nativeDeps."colors" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "colors" ]; }; - full."colors"."0.5.x" = lib.makeOverridable self.buildNodePackage { + by-spec."colors"."0.5.x" = + self.by-version."colors"."0.5.1"; + by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "colors-0.5.1"; src = [ (fetchurl { @@ -1954,14 +1739,16 @@ }) ]; buildInputs = - (self.nativeDeps."colors"."0.5.x" or []); + (self.nativeDeps."colors" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "colors" ]; }; - full."colors"."0.6.0-1" = lib.makeOverridable self.buildNodePackage { + by-spec."colors"."0.6.0-1" = + self.by-version."colors"."0.6.0-1"; + by-version."colors"."0.6.0-1" = lib.makeOverridable self.buildNodePackage { name = "colors-0.6.0-1"; src = [ (fetchurl { @@ -1970,14 +1757,16 @@ }) ]; buildInputs = - (self.nativeDeps."colors"."0.6.0-1" or []); + (self.nativeDeps."colors" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "colors" ]; }; - full."colors"."0.6.x" = lib.makeOverridable self.buildNodePackage { + by-spec."colors"."0.6.x" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "colors-0.6.2"; src = [ (fetchurl { @@ -1986,46 +1775,20 @@ }) ]; buildInputs = - (self.nativeDeps."colors"."0.6.x" or []); + (self.nativeDeps."colors" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "colors" ]; }; - full."colors"."0.x.x" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors"."0.x.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - full."colors"."~0.6.0-1" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors"."~0.6.0-1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - full."combined-stream"."~0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."colors"."0.x.x" = + self.by-version."colors"."0.6.2"; + by-spec."colors"."~0.6.0-1" = + self.by-version."colors"."0.6.2"; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.4"; + by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "combined-stream-0.0.4"; src = [ (fetchurl { @@ -2034,15 +1797,17 @@ }) ]; buildInputs = - (self.nativeDeps."combined-stream"."~0.0.4" or []); + (self.nativeDeps."combined-stream" or []); deps = [ - self.full."delayed-stream"."0.0.5" + self.by-version."delayed-stream"."0.0.5" ]; peerDependencies = [ ]; passthru.names = [ "combined-stream" ]; }; - full."commander"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."commander"."*" = + self.by-version."commander"."2.0.0"; + by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { name = "commander-2.0.0"; src = [ (fetchurl { @@ -2051,14 +1816,16 @@ }) ]; buildInputs = - (self.nativeDeps."commander"."*" or []); + (self.nativeDeps."commander" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; - full."commander"."0.5.1" = lib.makeOverridable self.buildNodePackage { + by-spec."commander"."0.5.1" = + self.by-version."commander"."0.5.1"; + by-version."commander"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "commander-0.5.1"; src = [ (fetchurl { @@ -2067,14 +1834,16 @@ }) ]; buildInputs = - (self.nativeDeps."commander"."0.5.1" or []); + (self.nativeDeps."commander" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; - full."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { + by-spec."commander"."0.6.1" = + self.by-version."commander"."0.6.1"; + by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "commander-0.6.1"; src = [ (fetchurl { @@ -2083,62 +1852,43 @@ }) ]; buildInputs = - (self.nativeDeps."commander"."0.6.1" or []); + (self.nativeDeps."commander" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; - full."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.0.0"; + by-spec."commander"."1.3.2" = + self.by-version."commander"."1.3.2"; + by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "commander-1.3.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; + url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }) ]; buildInputs = - (self.nativeDeps."commander"."2.0.0" or []); + (self.nativeDeps."commander" or []); deps = [ + self.by-version."keypress"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; - full."commander"."2.0.x" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; - }) - ]; - buildInputs = - (self.nativeDeps."commander"."2.0.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; - full."commander"."~0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "commander-0.6.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }) - ]; - buildInputs = - (self.nativeDeps."commander"."~0.6.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; - }; - full."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { + by-spec."commander"."1.3.x" = + self.by-version."commander"."1.3.2"; + by-spec."commander"."2.0.0" = + self.by-version."commander"."2.0.0"; + by-spec."commander"."2.0.x" = + self.by-version."commander"."2.0.0"; + by-spec."commander"."~0.6.1" = + self.by-version."commander"."0.6.1"; + by-spec."config"."0.4.15" = + self.by-version."config"."0.4.15"; + by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage { name = "config-0.4.15"; src = [ (fetchurl { @@ -2147,17 +1897,19 @@ }) ]; buildInputs = - (self.nativeDeps."config"."0.4.15" or []); + (self.nativeDeps."config" or []); deps = [ - self.full."js-yaml"."0.3.x" - self.full."coffee-script".">=1.2.0" - self.full."vows".">=0.5.13" + self.by-version."js-yaml"."0.3.7" + self.by-version."coffee-script"."1.6.3" + self.by-version."vows"."0.7.0" ]; peerDependencies = [ ]; passthru.names = [ "config" ]; }; - full."config-chain"."~1.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."config-chain"."~1.1.1" = + self.by-version."config-chain"."1.1.8"; + by-version."config-chain"."1.1.8" = lib.makeOverridable self.buildNodePackage { name = "config-chain-1.1.8"; src = [ (fetchurl { @@ -2166,16 +1918,20 @@ }) ]; buildInputs = - (self.nativeDeps."config-chain"."~1.1.1" or []); + (self.nativeDeps."config-chain" or []); deps = [ - self.full."proto-list"."~1.2.1" - self.full."ini"."1" + self.by-version."proto-list"."1.2.2" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "config-chain" ]; }; - full."configstore"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + 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.5"; + by-version."configstore"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "configstore-0.1.5"; src = [ (fetchurl { @@ -2184,18 +1940,20 @@ }) ]; buildInputs = - (self.nativeDeps."configstore"."~0.1.0" or []); + (self.nativeDeps."configstore" or []); deps = [ - self.full."lodash"."~1.3.0" - self.full."mkdirp"."~0.3.5" - self.full."js-yaml"."~2.1.0" - self.full."osenv"."0.0.3" + self.by-version."lodash"."1.3.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."js-yaml"."2.1.3" + self.by-version."osenv"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "configstore" ]; }; - full."connect"."1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."connect"."1.x" = + self.by-version."connect"."1.9.2"; + by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage { name = "connect-1.9.2"; src = [ (fetchurl { @@ -2204,43 +1962,51 @@ }) ]; buildInputs = - (self.nativeDeps."connect"."1.x" or []); + (self.nativeDeps."connect" or []); deps = [ - self.full."qs".">= 0.4.0" - self.full."mime".">= 0.0.1" - self.full."formidable"."1.0.x" + self.by-version."qs"."0.6.5" + self.by-version."mime"."1.2.11" + self.by-version."formidable"."1.0.14" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.7.11" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.7.11"; + by-spec."connect"."2.11.0" = + self.by-version."connect"."2.11.0"; + by-version."connect"."2.11.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; - sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; + url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; }) ]; buildInputs = - (self.nativeDeps."connect"."2.7.11" or []); + (self.nativeDeps."connect" or []); deps = [ - self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" - self.full."cookie-signature"."1.0.1" - self.full."buffer-crc32"."0.2.1" - self.full."cookie"."0.0.5" - self.full."send"."0.1.1" - self.full."bytes"."0.2.0" - self.full."fresh"."0.1.0" - self.full."pause"."0.0.1" - self.full."debug"."*" + self.by-version."qs"."0.6.5" + 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."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.3" + self.by-version."methods"."0.0.1" + self.by-version."raw-body"."0.0.3" + self.by-version."negotiator"."0.3.0" + self.by-version."multiparty"."2.2.0" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage { + by-spec."connect"."2.7.5" = + self.by-version."connect"."2.7.5"; + by-version."connect"."2.7.5" = lib.makeOverridable self.buildNodePackage { name = "connect-2.7.5"; src = [ (fetchurl { @@ -2249,24 +2015,26 @@ }) ]; buildInputs = - (self.nativeDeps."connect"."2.7.5" or []); + (self.nativeDeps."connect" or []); deps = [ - self.full."qs"."0.5.1" - self.full."formidable"."1.0.11" - self.full."cookie-signature"."1.0.0" - self.full."buffer-crc32"."0.1.1" - self.full."cookie"."0.0.5" - self.full."send"."0.1.0" - self.full."bytes"."0.2.0" - self.full."fresh"."0.1.0" - self.full."pause"."0.0.1" - self.full."debug"."*" + self.by-version."qs"."0.5.1" + self.by-version."formidable"."1.0.11" + self.by-version."cookie-signature"."1.0.0" + self.by-version."buffer-crc32"."0.1.1" + self.by-version."cookie"."0.0.5" + self.by-version."send"."0.1.0" + 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.3" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage { + by-spec."connect"."2.7.6" = + self.by-version."connect"."2.7.6"; + by-version."connect"."2.7.6" = lib.makeOverridable self.buildNodePackage { name = "connect-2.7.6"; src = [ (fetchurl { @@ -2275,80 +2043,28 @@ }) ]; buildInputs = - (self.nativeDeps."connect"."2.7.6" or []); + (self.nativeDeps."connect" or []); deps = [ - self.full."qs"."0.5.1" - self.full."formidable"."1.0.11" - self.full."cookie-signature"."1.0.1" - self.full."buffer-crc32"."0.1.1" - self.full."cookie"."0.0.5" - self.full."send"."0.1.0" - self.full."bytes"."0.2.0" - self.full."fresh"."0.1.0" - self.full."pause"."0.0.1" - self.full."debug"."*" + self.by-version."qs"."0.5.1" + self.by-version."formidable"."1.0.11" + self.by-version."cookie-signature"."1.0.1" + self.by-version."buffer-crc32"."0.1.1" + self.by-version."cookie"."0.0.5" + self.by-version."send"."0.1.0" + 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.3" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.9.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.9.1.tgz"; - sha1 = "a0a733f2e629b8af85aa0701fbd0737f52549052"; - }) - ]; - buildInputs = - (self.nativeDeps."connect"."2.9.1" or []); - deps = [ - self.full."qs"."0.6.5" - self.full."cookie-signature"."1.0.1" - self.full."buffer-crc32"."0.2.1" - self.full."cookie"."0.1.0" - self.full."send"."0.1.4" - self.full."bytes"."0.2.0" - self.full."fresh"."0.2.0" - self.full."pause"."0.0.1" - self.full."uid2"."0.0.2" - self.full."debug"."*" - self.full."methods"."0.0.1" - self.full."multiparty"."2.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "connect" ]; - }; - full."connect"."~2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.9.1.tgz"; - sha1 = "a0a733f2e629b8af85aa0701fbd0737f52549052"; - }) - ]; - buildInputs = - (self.nativeDeps."connect"."~2" or []); - deps = [ - self.full."qs"."0.6.5" - self.full."cookie-signature"."1.0.1" - self.full."buffer-crc32"."0.2.1" - self.full."cookie"."0.1.0" - self.full."send"."0.1.4" - self.full."bytes"."0.2.0" - self.full."fresh"."0.2.0" - self.full."pause"."0.0.1" - self.full."uid2"."0.0.2" - self.full."debug"."*" - self.full."methods"."0.0.1" - self.full."multiparty"."2.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "connect" ]; - }; - full."connect"."~2.8.4" = lib.makeOverridable self.buildNodePackage { + by-spec."connect"."~2" = + self.by-version."connect"."2.11.0"; + by-spec."connect"."~2.8.4" = + self.by-version."connect"."2.8.8"; + by-version."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { name = "connect-2.8.8"; src = [ (fetchurl { @@ -2357,26 +2073,28 @@ }) ]; buildInputs = - (self.nativeDeps."connect"."~2.8.4" or []); + (self.nativeDeps."connect" or []); deps = [ - self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" - self.full."cookie-signature"."1.0.1" - self.full."buffer-crc32"."0.2.1" - self.full."cookie"."0.1.0" - self.full."send"."0.1.4" - self.full."bytes"."0.2.0" - self.full."fresh"."0.2.0" - self.full."pause"."0.0.1" - self.full."uid2"."0.0.2" - self.full."debug"."*" - self.full."methods"."0.0.1" + self.by-version."qs"."0.6.5" + self.by-version."formidable"."1.0.14" + 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."bytes"."0.2.0" + self.by-version."fresh"."0.2.0" + self.by-version."pause"."0.0.1" + self.by-version."uid2"."0.0.2" + self.by-version."debug"."0.7.3" + self.by-version."methods"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; - full."connect-flash"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."connect-flash"."*" = + self.by-version."connect-flash"."0.1.1"; + by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "connect-flash-0.1.1"; src = [ (fetchurl { @@ -2385,15 +2103,17 @@ }) ]; buildInputs = - (self.nativeDeps."connect-flash"."*" or []); + (self.nativeDeps."connect-flash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "connect-flash" ]; }; - "connect-flash" = self.full."connect-flash"."*"; - full."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage { + "connect-flash" = self.by-version."connect-flash"."0.1.1"; + by-spec."connect-flash"."0.1.0" = + self.by-version."connect-flash"."0.1.0"; + by-version."connect-flash"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "connect-flash-0.1.0"; src = [ (fetchurl { @@ -2402,14 +2122,16 @@ }) ]; buildInputs = - (self.nativeDeps."connect-flash"."0.1.0" or []); + (self.nativeDeps."connect-flash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "connect-flash" ]; }; - full."connect-jade-static"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."connect-jade-static"."*" = + self.by-version."connect-jade-static"."0.1.1"; + by-version."connect-jade-static"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "connect-jade-static-0.1.1"; src = [ (fetchurl { @@ -2418,16 +2140,18 @@ }) ]; buildInputs = - (self.nativeDeps."connect-jade-static"."*" or []); + (self.nativeDeps."connect-jade-static" or []); deps = [ - self.full."jade"."*" + self.by-version."jade"."0.35.0" ]; peerDependencies = [ ]; passthru.names = [ "connect-jade-static" ]; }; - "connect-jade-static" = self.full."connect-jade-static"."*"; - full."connect-mongo"."*" = lib.makeOverridable self.buildNodePackage { + "connect-jade-static" = self.by-version."connect-jade-static"."0.1.1"; + by-spec."connect-mongo"."*" = + self.by-version."connect-mongo"."0.3.3"; + by-version."connect-mongo"."0.3.3" = lib.makeOverridable self.buildNodePackage { name = "connect-mongo-0.3.3"; src = [ (fetchurl { @@ -2436,16 +2160,18 @@ }) ]; buildInputs = - (self.nativeDeps."connect-mongo"."*" or []); + (self.nativeDeps."connect-mongo" or []); deps = [ - self.full."mongodb"."1.2.x" + self.by-version."mongodb"."1.2.14" ]; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.full."connect-mongo"."*"; - full."console-browserify"."0.1.x" = lib.makeOverridable self.buildNodePackage { + "connect-mongo" = self.by-version."connect-mongo"."0.3.3"; + by-spec."console-browserify"."0.1.x" = + self.by-version."console-browserify"."0.1.6"; + by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "console-browserify-0.1.6"; src = [ (fetchurl { @@ -2454,14 +2180,16 @@ }) ]; buildInputs = - (self.nativeDeps."console-browserify"."0.1.x" or []); + (self.nativeDeps."console-browserify" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "console-browserify" ]; }; - full."constantinople"."~1.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."constantinople"."~1.0.1" = + self.by-version."constantinople"."1.0.2"; + by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "constantinople-1.0.2"; src = [ (fetchurl { @@ -2470,15 +2198,17 @@ }) ]; buildInputs = - (self.nativeDeps."constantinople"."~1.0.1" or []); + (self.nativeDeps."constantinople" or []); deps = [ - self.full."uglify-js"."~2.4.0" + self.by-version."uglify-js"."2.4.2" ]; peerDependencies = [ ]; passthru.names = [ "constantinople" ]; }; - full."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie"."0.0.5" = + self.by-version."cookie"."0.0.5"; + by-version."cookie"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "cookie-0.0.5"; src = [ (fetchurl { @@ -2487,14 +2217,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie"."0.0.5" or []); + (self.nativeDeps."cookie" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie" ]; }; - full."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie"."0.1.0" = + self.by-version."cookie"."0.1.0"; + by-version."cookie"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "cookie-0.1.0"; src = [ (fetchurl { @@ -2503,14 +2235,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie"."0.1.0" or []); + (self.nativeDeps."cookie" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie" ]; }; - full."cookie-jar"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie-jar"."~0.2.0" = + self.by-version."cookie-jar"."0.2.0"; + by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "cookie-jar-0.2.0"; src = [ (fetchurl { @@ -2519,14 +2253,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie-jar"."~0.2.0" or []); + (self.nativeDeps."cookie-jar" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie-jar" ]; }; - full."cookie-jar"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie-jar"."~0.3.0" = + self.by-version."cookie-jar"."0.3.0"; + by-version."cookie-jar"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "cookie-jar-0.3.0"; src = [ (fetchurl { @@ -2535,14 +2271,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie-jar"."~0.3.0" or []); + (self.nativeDeps."cookie-jar" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie-jar" ]; }; - full."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie-signature"."1.0.0" = + self.by-version."cookie-signature"."1.0.0"; + by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "cookie-signature-1.0.0"; src = [ (fetchurl { @@ -2551,14 +2289,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie-signature"."1.0.0" or []); + (self.nativeDeps."cookie-signature" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie-signature" ]; }; - full."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."cookie-signature"."1.0.1" = + self.by-version."cookie-signature"."1.0.1"; + by-version."cookie-signature"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "cookie-signature-1.0.1"; src = [ (fetchurl { @@ -2567,14 +2307,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookie-signature"."1.0.1" or []); + (self.nativeDeps."cookie-signature" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookie-signature" ]; }; - full."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."cookiejar"."1.3.0" = + self.by-version."cookiejar"."1.3.0"; + by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage { name = "cookiejar-1.3.0"; src = [ (fetchurl { @@ -2583,14 +2325,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookiejar"."1.3.0" or []); + (self.nativeDeps."cookiejar" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookiejar" ]; }; - full."cookies".">= 0.2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."cookies".">= 0.2.2" = + self.by-version."cookies"."0.3.6"; + by-version."cookies"."0.3.6" = lib.makeOverridable self.buildNodePackage { name = "cookies-0.3.6"; src = [ (fetchurl { @@ -2599,14 +2343,16 @@ }) ]; buildInputs = - (self.nativeDeps."cookies".">= 0.2.2" or []); + (self.nativeDeps."cookies" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cookies" ]; }; - full."core-util-is"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.0"; + by-version."core-util-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "core-util-is-1.0.0"; src = [ (fetchurl { @@ -2615,14 +2361,16 @@ }) ]; buildInputs = - (self.nativeDeps."core-util-is"."~1.0.0" or []); + (self.nativeDeps."core-util-is" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "core-util-is" ]; }; - full."couch-login"."~0.1.15" = lib.makeOverridable self.buildNodePackage { + by-spec."couch-login"."~0.1.15" = + self.by-version."couch-login"."0.1.18"; + by-version."couch-login"."0.1.18" = lib.makeOverridable self.buildNodePackage { name = "couch-login-0.1.18"; src = [ (fetchurl { @@ -2631,32 +2379,19 @@ }) ]; buildInputs = - (self.nativeDeps."couch-login"."~0.1.15" or []); + (self.nativeDeps."couch-login" or []); deps = [ - self.full."request"."2 >=2.25.0" + self.by-version."request"."2.27.0" ]; peerDependencies = [ ]; passthru.names = [ "couch-login" ]; }; - full."couch-login"."~0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "couch-login-0.1.18"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz"; - sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056"; - }) - ]; - buildInputs = - (self.nativeDeps."couch-login"."~0.1.18" or []); - deps = [ - self.full."request"."2 >=2.25.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "couch-login" ]; - }; - full."coveralls"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."couch-login"."~0.1.18" = + self.by-version."couch-login"."0.1.18"; + by-spec."coveralls"."*" = + self.by-version."coveralls"."2.3.0"; + by-version."coveralls"."2.3.0" = lib.makeOverridable self.buildNodePackage { name = "coveralls-2.3.0"; src = [ (fetchurl { @@ -2665,19 +2400,21 @@ }) ]; buildInputs = - (self.nativeDeps."coveralls"."*" or []); + (self.nativeDeps."coveralls" or []); deps = [ - self.full."yaml"."0.2.3" - self.full."request"."2.16.2" - self.full."lcov-parse"."0.0.4" - self.full."log-driver"."1.2.1" + self.by-version."yaml"."0.2.3" + self.by-version."request"."2.16.2" + self.by-version."lcov-parse"."0.0.4" + self.by-version."log-driver"."1.2.1" ]; peerDependencies = [ ]; passthru.names = [ "coveralls" ]; }; - "coveralls" = self.full."coveralls"."*"; - full."crossroads"."~0.12.0" = lib.makeOverridable self.buildNodePackage { + "coveralls" = self.by-version."coveralls"."2.3.0"; + by-spec."crossroads"."~0.12.0" = + self.by-version."crossroads"."0.12.0"; + by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage { name = "crossroads-0.12.0"; src = [ (fetchurl { @@ -2686,15 +2423,17 @@ }) ]; buildInputs = - (self.nativeDeps."crossroads"."~0.12.0" or []); + (self.nativeDeps."crossroads" or []); deps = [ - self.full."signals"."<2.0" + self.by-version."signals"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "crossroads" ]; }; - full."cryptiles"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."cryptiles"."0.1.x" = + self.by-version."cryptiles"."0.1.3"; + by-version."cryptiles"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "cryptiles-0.1.3"; src = [ (fetchurl { @@ -2703,15 +2442,17 @@ }) ]; buildInputs = - (self.nativeDeps."cryptiles"."0.1.x" or []); + (self.nativeDeps."cryptiles" or []); deps = [ - self.full."boom"."0.3.x" + self.by-version."boom"."0.3.8" ]; peerDependencies = [ ]; passthru.names = [ "cryptiles" ]; }; - full."cryptiles"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "cryptiles-0.2.2"; src = [ (fetchurl { @@ -2720,15 +2461,17 @@ }) ]; buildInputs = - (self.nativeDeps."cryptiles"."0.2.x" or []); + (self.nativeDeps."cryptiles" or []); deps = [ - self.full."boom"."0.4.x" + self.by-version."boom"."0.4.2" ]; peerDependencies = [ ]; passthru.names = [ "cryptiles" ]; }; - full."css"."~1.0.8" = lib.makeOverridable self.buildNodePackage { + by-spec."css"."~1.0.8" = + self.by-version."css"."1.0.8"; + by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "css-1.0.8"; src = [ (fetchurl { @@ -2737,16 +2480,18 @@ }) ]; buildInputs = - (self.nativeDeps."css"."~1.0.8" or []); + (self.nativeDeps."css" or []); deps = [ - self.full."css-parse"."1.0.4" - self.full."css-stringify"."1.0.5" + self.by-version."css-parse"."1.0.4" + self.by-version."css-stringify"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "css" ]; }; - full."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."css-parse"."1.0.4" = + self.by-version."css-parse"."1.0.4"; + by-version."css-parse"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "css-parse-1.0.4"; src = [ (fetchurl { @@ -2755,14 +2500,16 @@ }) ]; buildInputs = - (self.nativeDeps."css-parse"."1.0.4" or []); + (self.nativeDeps."css-parse" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "css-parse" ]; }; - full."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."css-stringify"."1.0.5" = + self.by-version."css-stringify"."1.0.5"; + by-version."css-stringify"."1.0.5" = lib.makeOverridable self.buildNodePackage { name = "css-stringify-1.0.5"; src = [ (fetchurl { @@ -2771,14 +2518,16 @@ }) ]; buildInputs = - (self.nativeDeps."css-stringify"."1.0.5" or []); + (self.nativeDeps."css-stringify" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "css-stringify" ]; }; - full."cssom"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."cssom"."0.2.x" = + self.by-version."cssom"."0.2.5"; + by-version."cssom"."0.2.5" = lib.makeOverridable self.buildNodePackage { name = "cssom-0.2.5"; src = [ (fetchurl { @@ -2787,14 +2536,16 @@ }) ]; buildInputs = - (self.nativeDeps."cssom"."0.2.x" or []); + (self.nativeDeps."cssom" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cssom" ]; }; - full."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."ctype"."0.5.0" = + self.by-version."ctype"."0.5.0"; + by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage { name = "ctype-0.5.0"; src = [ (fetchurl { @@ -2803,14 +2554,16 @@ }) ]; buildInputs = - (self.nativeDeps."ctype"."0.5.0" or []); + (self.nativeDeps."ctype" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ctype" ]; }; - full."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { name = "ctype-0.5.2"; src = [ (fetchurl { @@ -2819,14 +2572,16 @@ }) ]; buildInputs = - (self.nativeDeps."ctype"."0.5.2" or []); + (self.nativeDeps."ctype" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ctype" ]; }; - full."cycle"."1.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."cycle"."1.0.x" = + self.by-version."cycle"."1.0.2"; + by-version."cycle"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "cycle-1.0.2"; src = [ (fetchurl { @@ -2835,14 +2590,16 @@ }) ]; buildInputs = - (self.nativeDeps."cycle"."1.0.x" or []); + (self.nativeDeps."cycle" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "cycle" ]; }; - full."dargs"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."dargs"."~0.1.0" = + self.by-version."dargs"."0.1.0"; + by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "dargs-0.1.0"; src = [ (fetchurl { @@ -2851,14 +2608,16 @@ }) ]; buildInputs = - (self.nativeDeps."dargs"."~0.1.0" or []); + (self.nativeDeps."dargs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "dargs" ]; }; - full."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."dateformat"."1.0.2-1.2.3" = + self.by-version."dateformat"."1.0.2-1.2.3"; + by-version."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage { name = "dateformat-1.0.2-1.2.3"; src = [ (fetchurl { @@ -2867,14 +2626,16 @@ }) ]; buildInputs = - (self.nativeDeps."dateformat"."1.0.2-1.2.3" or []); + (self.nativeDeps."dateformat" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "dateformat" ]; }; - full."dateformat"."~1.0.6" = lib.makeOverridable self.buildNodePackage { + by-spec."dateformat"."~1.0.6" = + self.by-version."dateformat"."1.0.6-1.2.3"; + by-version."dateformat"."1.0.6-1.2.3" = lib.makeOverridable self.buildNodePackage { name = "dateformat-1.0.6-1.2.3"; src = [ (fetchurl { @@ -2883,30 +2644,34 @@ }) ]; buildInputs = - (self.nativeDeps."dateformat"."~1.0.6" or []); + (self.nativeDeps."dateformat" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "dateformat" ]; }; - full."debug"."*" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.2"; + by-spec."debug"."*" = + self.by-version."debug"."0.7.3"; + by-version."debug"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "debug-0.7.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; - sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; + url = "http://registry.npmjs.org/debug/-/debug-0.7.3.tgz"; + sha1 = "ba7ae369799066a28d234fb8dad6f05837839da8"; }) ]; buildInputs = - (self.nativeDeps."debug"."*" or []); + (self.nativeDeps."debug" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "debug" ]; }; - full."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage { + by-spec."debug"."0.7.0" = + self.by-version."debug"."0.7.0"; + by-version."debug"."0.7.0" = lib.makeOverridable self.buildNodePackage { name = "debug-0.7.0"; src = [ (fetchurl { @@ -2915,62 +2680,38 @@ }) ]; buildInputs = - (self.nativeDeps."debug"."0.7.0" or []); + (self.nativeDeps."debug" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "debug" ]; }; - full."debug"."~0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; - sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; - }) - ]; - buildInputs = - (self.nativeDeps."debug"."~0.7.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - full."debug"."~0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; - sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; - }) - ]; - buildInputs = - (self.nativeDeps."debug"."~0.7.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - full."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."debug"."~0.7.0" = + self.by-version."debug"."0.7.3"; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.3"; + by-spec."debuglog"."0.0.2" = + self.by-version."debuglog"."0.0.2"; + by-version."debuglog"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "debuglog-0.0.2"; src = [ (fetchurl { url = "http://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz"; - sha1 = "83f4cd091f955f5da7053789727ad506f1010f1c"; + sha1 = "6c0dcf07e2c3f74524629b741668bd46c7b362eb"; }) ]; buildInputs = - (self.nativeDeps."debuglog"."0.0.2" or []); + (self.nativeDeps."debuglog" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "debuglog" ]; }; - full."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { + by-spec."deep-eql"."0.1.3" = + self.by-version."deep-eql"."0.1.3"; + by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "deep-eql-0.1.3"; src = [ (fetchurl { @@ -2979,15 +2720,17 @@ }) ]; buildInputs = - (self.nativeDeps."deep-eql"."0.1.3" or []); + (self.nativeDeps."deep-eql" or []); deps = [ - self.full."type-detect"."0.1.1" + self.by-version."type-detect"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "deep-eql" ]; }; - full."deep-equal"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."deep-equal"."*" = + self.by-version."deep-equal"."0.1.0"; + by-version."deep-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "deep-equal-0.1.0"; src = [ (fetchurl { @@ -2996,14 +2739,16 @@ }) ]; buildInputs = - (self.nativeDeps."deep-equal"."*" or []); + (self.nativeDeps."deep-equal" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "deep-equal" ]; }; - full."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."deep-equal"."0.0.0" = + self.by-version."deep-equal"."0.0.0"; + by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { name = "deep-equal-0.0.0"; src = [ (fetchurl { @@ -3012,14 +2757,16 @@ }) ]; buildInputs = - (self.nativeDeps."deep-equal"."0.0.0" or []); + (self.nativeDeps."deep-equal" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "deep-equal" ]; }; - full."deep-extend"."~0.2.5" = lib.makeOverridable self.buildNodePackage { + by-spec."deep-extend"."~0.2.5" = + self.by-version."deep-extend"."0.2.6"; + by-version."deep-extend"."0.2.6" = lib.makeOverridable self.buildNodePackage { name = "deep-extend-0.2.6"; src = [ (fetchurl { @@ -3028,30 +2775,18 @@ }) ]; buildInputs = - (self.nativeDeps."deep-extend"."~0.2.5" or []); + (self.nativeDeps."deep-extend" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "deep-extend" ]; }; - full."deep-extend"."~0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "deep-extend-0.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.6.tgz"; - sha1 = "1f767e02b46d88d0a4087affa4b11b1b0b804250"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-extend"."~0.2.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "deep-extend" ]; - }; - full."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."deep-extend"."~0.2.6" = + self.by-version."deep-extend"."0.2.6"; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "delayed-stream-0.0.5"; src = [ (fetchurl { @@ -3060,14 +2795,16 @@ }) ]; buildInputs = - (self.nativeDeps."delayed-stream"."0.0.5" or []); + (self.nativeDeps."delayed-stream" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "delayed-stream" ]; }; - full."di"."~0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."di"."~0.0.1" = + self.by-version."di"."0.0.1"; + by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "di-0.0.1"; src = [ (fetchurl { @@ -3076,14 +2813,16 @@ }) ]; buildInputs = - (self.nativeDeps."di"."~0.0.1" or []); + (self.nativeDeps."di" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "di" ]; }; - full."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { + by-spec."diff"."1.0.7" = + self.by-version."diff"."1.0.7"; + by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { name = "diff-1.0.7"; src = [ (fetchurl { @@ -3092,46 +2831,22 @@ }) ]; buildInputs = - (self.nativeDeps."diff"."1.0.7" or []); + (self.nativeDeps."diff" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "diff" ]; }; - full."diff"."~1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; - sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; - }) - ]; - buildInputs = - (self.nativeDeps."diff"."~1.0.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "diff" ]; - }; - full."diff"."~1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; - sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; - }) - ]; - buildInputs = - (self.nativeDeps."diff"."~1.0.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "diff" ]; - }; - full."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { + by-spec."diff"."~1.0.3" = + self.by-version."diff"."1.0.7"; + by-spec."diff"."~1.0.4" = + self.by-version."diff"."1.0.7"; + by-spec."diff"."~1.0.7" = + self.by-version."diff"."1.0.7"; + by-spec."director"."1.1.10" = + self.by-version."director"."1.1.10"; + by-version."director"."1.1.10" = lib.makeOverridable self.buildNodePackage { name = "director-1.1.10"; src = [ (fetchurl { @@ -3140,14 +2855,16 @@ }) ]; buildInputs = - (self.nativeDeps."director"."1.1.10" or []); + (self.nativeDeps."director" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "director" ]; }; - full."domelementtype"."1" = lib.makeOverridable self.buildNodePackage { + by-spec."domelementtype"."1" = + self.by-version."domelementtype"."1.1.1"; + by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "domelementtype-1.1.1"; src = [ (fetchurl { @@ -3156,14 +2873,16 @@ }) ]; buildInputs = - (self.nativeDeps."domelementtype"."1" or []); + (self.nativeDeps."domelementtype" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "domelementtype" ]; }; - full."domhandler"."2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."domhandler"."2.0" = + self.by-version."domhandler"."2.0.3"; + by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage { name = "domhandler-2.0.3"; src = [ (fetchurl { @@ -3172,15 +2891,17 @@ }) ]; buildInputs = - (self.nativeDeps."domhandler"."2.0" or []); + (self.nativeDeps."domhandler" or []); deps = [ - self.full."domelementtype"."1" + self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "domhandler" ]; }; - full."domutils"."1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."domutils"."1.0" = + self.by-version."domutils"."1.0.1"; + by-version."domutils"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "domutils-1.0.1"; src = [ (fetchurl { @@ -3189,15 +2910,17 @@ }) ]; buildInputs = - (self.nativeDeps."domutils"."1.0" or []); + (self.nativeDeps."domutils" or []); deps = [ - self.full."domelementtype"."1" + self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "domutils" ]; }; - full."domutils"."1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."domutils"."1.1" = + self.by-version."domutils"."1.1.6"; + by-version."domutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { name = "domutils-1.1.6"; src = [ (fetchurl { @@ -3206,15 +2929,17 @@ }) ]; buildInputs = - (self.nativeDeps."domutils"."1.1" or []); + (self.nativeDeps."domutils" or []); deps = [ - self.full."domelementtype"."1" + self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "domutils" ]; }; - full."domutils"."1.2" = lib.makeOverridable self.buildNodePackage { + by-spec."domutils"."1.2" = + self.by-version."domutils"."1.2.1"; + by-version."domutils"."1.2.1" = lib.makeOverridable self.buildNodePackage { name = "domutils-1.2.1"; src = [ (fetchurl { @@ -3223,15 +2948,17 @@ }) ]; buildInputs = - (self.nativeDeps."domutils"."1.2" or []); + (self.nativeDeps."domutils" or []); deps = [ - self.full."domelementtype"."1" + self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "domutils" ]; }; - full."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage { + by-spec."dtrace-provider"."0.2.8" = + self.by-version."dtrace-provider"."0.2.8"; + by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage { name = "dtrace-provider-0.2.8"; src = [ (fetchurl { @@ -3240,30 +2967,34 @@ }) ]; buildInputs = - (self.nativeDeps."dtrace-provider"."0.2.8" or []); + (self.nativeDeps."dtrace-provider" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "dtrace-provider" ]; }; - full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.4"; + by-spec."editor"."0.0.5" = + self.by-version."editor"."0.0.5"; + by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "editor-0.0.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; - sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; + url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; + sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; }) ]; buildInputs = - (self.nativeDeps."editor"."0.0.4" or []); + (self.nativeDeps."editor" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "editor" ]; }; - full."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage { + by-spec."ejs"."0.8.3" = + self.by-version."ejs"."0.8.3"; + by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage { name = "ejs-0.8.3"; src = [ (fetchurl { @@ -3272,14 +3003,16 @@ }) ]; buildInputs = - (self.nativeDeps."ejs"."0.8.3" or []); + (self.nativeDeps."ejs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ejs" ]; }; - full."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage { + by-spec."emitter-component"."0.0.6" = + self.by-version."emitter-component"."0.0.6"; + by-version."emitter-component"."0.0.6" = lib.makeOverridable self.buildNodePackage { name = "emitter-component-0.0.6"; src = [ (fetchurl { @@ -3288,14 +3021,16 @@ }) ]; buildInputs = - (self.nativeDeps."emitter-component"."0.0.6" or []); + (self.nativeDeps."emitter-component" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "emitter-component" ]; }; - full."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."emitter-component"."1.0.0" = + self.by-version."emitter-component"."1.0.0"; + by-version."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "emitter-component-1.0.0"; src = [ (fetchurl { @@ -3304,14 +3039,16 @@ }) ]; buildInputs = - (self.nativeDeps."emitter-component"."1.0.0" or []); + (self.nativeDeps."emitter-component" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "emitter-component" ]; }; - full."encoding"."~0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."encoding"."~0.1" = + self.by-version."encoding"."0.1.7"; + by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "encoding-0.1.7"; src = [ (fetchurl { @@ -3320,15 +3057,35 @@ }) ]; buildInputs = - (self.nativeDeps."encoding"."~0.1" or []); + (self.nativeDeps."encoding" or []); deps = [ - self.full."iconv-lite"."~0.2.11" + self.by-version."iconv-lite"."0.2.11" ]; peerDependencies = [ ]; passthru.names = [ "encoding" ]; }; - full."entities"."0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."ent"."~0.1.0" = + self.by-version."ent"."0.1.0"; + by-version."ent"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ent-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ent/-/ent-0.1.0.tgz"; + sha1 = "deb9cd7f3da25b1a94c248dbbdc91d0f0c094035"; + }) + ]; + buildInputs = + (self.nativeDeps."ent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ent" ]; + }; + by-spec."entities"."0.x" = + self.by-version."entities"."0.3.0"; + by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "entities-0.3.0"; src = [ (fetchurl { @@ -3337,14 +3094,16 @@ }) ]; buildInputs = - (self.nativeDeps."entities"."0.x" or []); + (self.nativeDeps."entities" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "entities" ]; }; - full."es5-ext"."~0.9.2" = lib.makeOverridable self.buildNodePackage { + by-spec."es5-ext"."~0.9.2" = + self.by-version."es5-ext"."0.9.2"; + by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage { name = "es5-ext-0.9.2"; src = [ (fetchurl { @@ -3353,14 +3112,16 @@ }) ]; buildInputs = - (self.nativeDeps."es5-ext"."~0.9.2" or []); + (self.nativeDeps."es5-ext" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "es5-ext" ]; }; - full."escape-html"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."escape-html"."*" = + self.by-version."escape-html"."1.0.0"; + by-version."escape-html"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "escape-html-1.0.0"; src = [ (fetchurl { @@ -3369,15 +3130,17 @@ }) ]; buildInputs = - (self.nativeDeps."escape-html"."*" or []); + (self.nativeDeps."escape-html" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "escape-html" ]; }; - "escape-html" = self.full."escape-html"."*"; - full."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage { + "escape-html" = self.by-version."escape-html"."1.0.0"; + 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"; src = [ (fetchurl { @@ -3386,17 +3149,19 @@ }) ]; buildInputs = - (self.nativeDeps."escodegen"."0.0.23" or []); + (self.nativeDeps."escodegen" or []); deps = [ - self.full."esprima"."~1.0.2" - self.full."estraverse"."~0.0.4" - self.full."source-map".">= 0.1.2" + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."0.0.4" + self.by-version."source-map"."0.1.31" ]; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; - full."esprima"."1.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."esprima"."1.0.x" = + self.by-version."esprima"."1.0.4"; + by-version."esprima"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "esprima-1.0.4"; src = [ (fetchurl { @@ -3405,62 +3170,22 @@ }) ]; buildInputs = - (self.nativeDeps."esprima"."1.0.x" or []); + (self.nativeDeps."esprima" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "esprima" ]; }; - full."esprima"."~ 1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }) - ]; - buildInputs = - (self.nativeDeps."esprima"."~ 1.0.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "esprima" ]; - }; - full."esprima"."~1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }) - ]; - buildInputs = - (self.nativeDeps."esprima"."~1.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "esprima" ]; - }; - full."esprima"."~1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "esprima-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }) - ]; - buildInputs = - (self.nativeDeps."esprima"."~1.0.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "esprima" ]; - }; - full."estraverse"."~0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."esprima"."~ 1.0.2" = + self.by-version."esprima"."1.0.4"; + by-spec."esprima"."~1.0.0" = + self.by-version."esprima"."1.0.4"; + by-spec."esprima"."~1.0.2" = + self.by-version."esprima"."1.0.4"; + by-spec."estraverse"."~0.0.4" = + self.by-version."estraverse"."0.0.4"; + by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "estraverse-0.0.4"; src = [ (fetchurl { @@ -3469,14 +3194,16 @@ }) ]; buildInputs = - (self.nativeDeps."estraverse"."~0.0.4" or []); + (self.nativeDeps."estraverse" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "estraverse" ]; }; - full."event-emitter"."~0.2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."event-emitter"."~0.2.2" = + self.by-version."event-emitter"."0.2.2"; + by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "event-emitter-0.2.2"; src = [ (fetchurl { @@ -3485,15 +3212,17 @@ }) ]; buildInputs = - (self.nativeDeps."event-emitter"."~0.2.2" or []); + (self.nativeDeps."event-emitter" or []); deps = [ - self.full."es5-ext"."~0.9.2" + self.by-version."es5-ext"."0.9.2" ]; peerDependencies = [ ]; passthru.names = [ "event-emitter" ]; }; - full."event-stream"."~0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."event-stream"."~0.5" = + self.by-version."event-stream"."0.5.3"; + by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage { name = "event-stream-0.5.3"; src = [ (fetchurl { @@ -3502,15 +3231,17 @@ }) ]; buildInputs = - (self.nativeDeps."event-stream"."~0.5" or []); + (self.nativeDeps."event-stream" or []); deps = [ - self.full."optimist"."0.2" + self.by-version."optimist"."0.2.8" ]; peerDependencies = [ ]; passthru.names = [ "event-stream" ]; }; - full."eventemitter2"."0.4.11" = lib.makeOverridable self.buildNodePackage { + by-spec."eventemitter2"."0.4.11" = + self.by-version."eventemitter2"."0.4.11"; + by-version."eventemitter2"."0.4.11" = lib.makeOverridable self.buildNodePackage { name = "eventemitter2-0.4.11"; src = [ (fetchurl { @@ -3519,14 +3250,16 @@ }) ]; buildInputs = - (self.nativeDeps."eventemitter2"."0.4.11" or []); + (self.nativeDeps."eventemitter2" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "eventemitter2" ]; }; - full."eventemitter2"."~0.4.11" = lib.makeOverridable self.buildNodePackage { + by-spec."eventemitter2"."~0.4.11" = + self.by-version."eventemitter2"."0.4.13"; + by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage { name = "eventemitter2-0.4.13"; src = [ (fetchurl { @@ -3535,30 +3268,18 @@ }) ]; buildInputs = - (self.nativeDeps."eventemitter2"."~0.4.11" or []); + (self.nativeDeps."eventemitter2" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "eventemitter2" ]; }; - full."eventemitter2"."~0.4.9" = lib.makeOverridable self.buildNodePackage { - name = "eventemitter2-0.4.13"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz"; - sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153"; - }) - ]; - buildInputs = - (self.nativeDeps."eventemitter2"."~0.4.9" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eventemitter2" ]; - }; - full."events.node".">= 0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."eventemitter2"."~0.4.9" = + self.by-version."eventemitter2"."0.4.13"; + by-spec."events.node".">= 0.4.0" = + self.by-version."events.node"."0.4.9"; + by-version."events.node"."0.4.9" = lib.makeOverridable self.buildNodePackage { name = "events.node-0.4.9"; src = [ (fetchurl { @@ -3567,42 +3288,46 @@ }) ]; buildInputs = - (self.nativeDeps."events.node".">= 0.4.0" or []); + (self.nativeDeps."events.node" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "events.node" ]; }; - full."express"."*" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.1"; + by-spec."express"."*" = + self.by-version."express"."3.4.4"; + by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; - sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; + url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; + sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }) ]; buildInputs = - (self.nativeDeps."express"."*" or []); + (self.nativeDeps."express" or []); deps = [ - self.full."connect"."2.9.1" - self.full."commander"."2.0.0" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."0.3.5" - self.full."cookie"."0.1.0" - self.full."buffer-crc32"."0.2.1" - self.full."fresh"."0.2.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.4" - self.full."cookie-signature"."1.0.1" - self.full."debug"."*" + self.by-version."connect"."2.11.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."debug"."0.7.3" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.full."express"."*"; - full."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { + "express" = self.by-version."express"."3.4.4"; + by-spec."express"."2.5.11" = + self.by-version."express"."2.5.11"; + by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { name = "express-2.5.11"; src = [ (fetchurl { @@ -3611,18 +3336,20 @@ }) ]; buildInputs = - (self.nativeDeps."express"."2.5.11" or []); + (self.nativeDeps."express" or []); deps = [ - self.full."connect"."1.x" - self.full."mime"."1.2.4" - self.full."qs"."0.4.x" - self.full."mkdirp"."0.3.0" + self.by-version."connect"."1.9.2" + self.by-version."mime"."1.2.4" + self.by-version."qs"."0.4.2" + self.by-version."mkdirp"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - full."express"."3.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."express"."3.2.0" = + self.by-version."express"."3.2.0"; + by-version."express"."3.2.0" = lib.makeOverridable self.buildNodePackage { name = "express-3.2.0"; src = [ (fetchurl { @@ -3631,79 +3358,29 @@ }) ]; buildInputs = - (self.nativeDeps."express"."3.2.0" or []); + (self.nativeDeps."express" or []); deps = [ - self.full."connect"."2.7.6" - self.full."commander"."0.6.1" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."~0.3.4" - self.full."cookie"."0.0.5" - self.full."buffer-crc32"."~0.2.1" - self.full."fresh"."0.1.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.0" - self.full."cookie-signature"."1.0.1" - self.full."debug"."*" + self.by-version."connect"."2.7.6" + self.by-version."commander"."0.6.1" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.0.5" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.1.0" + 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.3" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - full."express"."3.2.6" = lib.makeOverridable self.buildNodePackage { - name = "express-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.2.6.tgz"; - sha1 = "d8a9fe065adc23c5b41ec2c689c672b261430ffc"; - }) - ]; - buildInputs = - (self.nativeDeps."express"."3.2.6" or []); - deps = [ - self.full."connect"."2.7.11" - self.full."commander"."0.6.1" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."0.3.4" - self.full."cookie"."0.1.0" - self.full."buffer-crc32"."0.2.1" - self.full."fresh"."0.1.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.0" - self.full."cookie-signature"."1.0.1" - self.full."debug"."*" - ]; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; - full."express"."3.x" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; - sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; - }) - ]; - buildInputs = - (self.nativeDeps."express"."3.x" or []); - deps = [ - self.full."connect"."2.9.1" - self.full."commander"."2.0.0" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."0.3.5" - self.full."cookie"."0.1.0" - self.full."buffer-crc32"."0.2.1" - self.full."fresh"."0.2.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.4" - self.full."cookie-signature"."1.0.1" - self.full."debug"."*" - ]; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; - full."express"."~3.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."express"."3.x" = + self.by-version."express"."3.4.4"; + by-spec."express"."~3.1.1" = + self.by-version."express"."3.1.2"; + by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { name = "express-3.1.2"; src = [ (fetchurl { @@ -3712,72 +3389,54 @@ }) ]; buildInputs = - (self.nativeDeps."express"."~3.1.1" or []); + (self.nativeDeps."express" or []); deps = [ - self.full."connect"."2.7.5" - self.full."commander"."0.6.1" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."~0.3.4" - self.full."cookie"."0.0.5" - self.full."buffer-crc32"."~0.2.1" - self.full."fresh"."0.1.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.0" - self.full."cookie-signature"."1.0.0" - self.full."debug"."*" + self.by-version."connect"."2.7.5" + self.by-version."commander"."0.6.1" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.0.5" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.1.0" + 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.3" ]; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - full."express"."~3.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.1"; + by-spec."express"."~3.4" = + self.by-version."express"."3.4.4"; + by-spec."express"."~3.4.4" = + self.by-version."express"."3.4.4"; + by-spec."express-form"."*" = + self.by-version."express-form"."0.10.0"; + by-version."express-form"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "express-form-0.10.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.1.tgz"; - sha1 = "3b4fb8862b6a1dfce3dc760629833d0cfef9314c"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.10.0.tgz"; + sha1 = "f16180c3804007a548b2d74c21400ce3fc1c00cd"; }) ]; buildInputs = - (self.nativeDeps."express"."~3.4" or []); + (self.nativeDeps."express-form" or []); deps = [ - self.full."connect"."2.9.1" - self.full."commander"."2.0.0" - self.full."range-parser"."0.0.4" - self.full."mkdirp"."0.3.5" - self.full."cookie"."0.1.0" - self.full."buffer-crc32"."0.2.1" - self.full."fresh"."0.2.0" - self.full."methods"."0.0.1" - self.full."send"."0.1.4" - self.full."cookie-signature"."1.0.1" - self.full."debug"."*" + self.by-version."validator"."0.4.28" + self.by-version."object-additions"."0.5.1" + self.by-version."async"."0.2.9" ]; peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; - full."express-form"."*" = lib.makeOverridable self.buildNodePackage { - name = "express-form-0.8.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.8.1.tgz"; - sha1 = "14299158646a796fac584cb5980d63e587c02019"; - }) - ]; - buildInputs = - (self.nativeDeps."express-form"."*" or []); - deps = [ - self.full."validator"."0.4.x" - self.full."object-additions".">= 0.5.0" - ]; - peerDependencies = [ - self.full."express"."3.x" + self.by-version."express"."3.4.4" ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.full."express-form"."*"; - full."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { + "express-form" = self.by-version."express-form"."0.10.0"; + by-spec."express-partials"."0.0.6" = + self.by-version."express-partials"."0.0.6"; + by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { name = "express-partials-0.0.6"; src = [ (fetchurl { @@ -3786,14 +3445,16 @@ }) ]; buildInputs = - (self.nativeDeps."express-partials"."0.0.6" or []); + (self.nativeDeps."express-partials" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "express-partials" ]; }; - full."extend"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."extend"."*" = + self.by-version."extend"."1.2.1"; + by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage { name = "extend-1.2.1"; src = [ (fetchurl { @@ -3802,15 +3463,17 @@ }) ]; buildInputs = - (self.nativeDeps."extend"."*" or []); + (self.nativeDeps."extend" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "extend" ]; }; - "extend" = self.full."extend"."*"; - full."extract-opts"."~2.2.0" = lib.makeOverridable self.buildNodePackage { + "extend" = 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 { name = "extract-opts-2.2.0"; src = [ (fetchurl { @@ -3819,15 +3482,17 @@ }) ]; buildInputs = - (self.nativeDeps."extract-opts"."~2.2.0" or []); + (self.nativeDeps."extract-opts" or []); deps = [ - self.full."typechecker"."~2.0.1" + self.by-version."typechecker"."2.0.8" ]; peerDependencies = [ ]; passthru.names = [ "extract-opts" ]; }; - full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."extsprintf"."1.0.0" = + self.by-version."extsprintf"."1.0.0"; + by-version."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "extsprintf-1.0.0"; src = [ (fetchurl { @@ -3836,14 +3501,16 @@ }) ]; buildInputs = - (self.nativeDeps."extsprintf"."1.0.0" or []); + (self.nativeDeps."extsprintf" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "extsprintf" ]; }; - full."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."extsprintf"."1.0.2" = + self.by-version."extsprintf"."1.0.2"; + by-version."extsprintf"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "extsprintf-1.0.2"; src = [ (fetchurl { @@ -3852,14 +3519,16 @@ }) ]; buildInputs = - (self.nativeDeps."extsprintf"."1.0.2" or []); + (self.nativeDeps."extsprintf" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "extsprintf" ]; }; - full."eyes"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."eyes"."0.1.x" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "eyes-0.1.8"; src = [ (fetchurl { @@ -3868,30 +3537,18 @@ }) ]; buildInputs = - (self.nativeDeps."eyes"."0.1.x" or []); + (self.nativeDeps."eyes" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "eyes" ]; }; - full."eyes".">=0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "eyes-0.1.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }) - ]; - buildInputs = - (self.nativeDeps."eyes".">=0.1.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eyes" ]; - }; - full."faye-websocket"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."eyes".">=0.1.6" = + self.by-version."eyes"."0.1.8"; + by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.7.0"; + by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.7.0"; src = [ (fetchurl { @@ -3900,33 +3557,20 @@ }) ]; buildInputs = - (self.nativeDeps."faye-websocket"."*" or []); + (self.nativeDeps."faye-websocket" or []); deps = [ - self.full."websocket-driver".">=0.3.0" + self.by-version."websocket-driver"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.full."faye-websocket"."*"; - full."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; - sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; - }) - ]; - buildInputs = - (self.nativeDeps."faye-websocket"."0.7.0" or []); - deps = [ - self.full."websocket-driver".">=0.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "faye-websocket" ]; - }; - full."fileset"."0.1.x" = lib.makeOverridable self.buildNodePackage { + "faye-websocket" = self.by-version."faye-websocket"."0.7.0"; + by-spec."faye-websocket"."0.7.0" = + self.by-version."faye-websocket"."0.7.0"; + by-spec."fileset"."0.1.x" = + self.by-version."fileset"."0.1.5"; + by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "fileset-0.1.5"; src = [ (fetchurl { @@ -3935,16 +3579,18 @@ }) ]; buildInputs = - (self.nativeDeps."fileset"."0.1.x" or []); + (self.nativeDeps."fileset" or []); deps = [ - self.full."minimatch"."0.x" - self.full."glob"."3.x" + self.by-version."minimatch"."0.2.12" + self.by-version."glob"."3.2.6" ]; peerDependencies = [ ]; passthru.names = [ "fileset" ]; }; - full."findup-sync"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."findup-sync"."~0.1.0" = + self.by-version."findup-sync"."0.1.2"; + by-version."findup-sync"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "findup-sync-0.1.2"; src = [ (fetchurl { @@ -3953,34 +3599,20 @@ }) ]; buildInputs = - (self.nativeDeps."findup-sync"."~0.1.0" or []); + (self.nativeDeps."findup-sync" or []); deps = [ - self.full."glob"."~3.1.21" - self.full."lodash"."~1.0.1" + self.by-version."glob"."3.1.21" + self.by-version."lodash"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "findup-sync" ]; }; - full."findup-sync"."~0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "findup-sync-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.2.tgz"; - sha1 = "da2b96ca9f800e5a13d0a11110f490b65f62e96d"; - }) - ]; - buildInputs = - (self.nativeDeps."findup-sync"."~0.1.2" or []); - deps = [ - self.full."glob"."~3.1.21" - self.full."lodash"."~1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "findup-sync" ]; - }; - full."flatiron"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."findup-sync"."~0.1.2" = + self.by-version."findup-sync"."0.1.2"; + by-spec."flatiron"."*" = + self.by-version."flatiron"."0.3.8"; + by-version."flatiron"."0.3.8" = lib.makeOverridable self.buildNodePackage { name = "flatiron-0.3.8"; src = [ (fetchurl { @@ -3989,20 +3621,22 @@ }) ]; buildInputs = - (self.nativeDeps."flatiron"."*" or []); + (self.nativeDeps."flatiron" or []); deps = [ - self.full."broadway"."0.2.7" - self.full."optimist"."0.3.5" - self.full."prompt"."0.2.11" - self.full."director"."1.1.10" - self.full."pkginfo"."0.3.0" + self.by-version."broadway"."0.2.7" + self.by-version."optimist"."0.3.5" + self.by-version."prompt"."0.2.11" + self.by-version."director"."1.1.10" + self.by-version."pkginfo"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.full."flatiron"."*"; - full."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage { + "flatiron" = self.by-version."flatiron"."0.3.8"; + by-spec."flatiron"."0.3.5" = + self.by-version."flatiron"."0.3.5"; + by-version."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "flatiron-0.3.5"; src = [ (fetchurl { @@ -4011,19 +3645,21 @@ }) ]; buildInputs = - (self.nativeDeps."flatiron"."0.3.5" or []); + (self.nativeDeps."flatiron" or []); deps = [ - self.full."broadway"."0.2.7" - self.full."optimist"."0.3.5" - self.full."prompt"."0.2.9" - self.full."director"."1.1.10" - self.full."pkginfo"."0.3.0" + self.by-version."broadway"."0.2.7" + self.by-version."optimist"."0.3.5" + self.by-version."prompt"."0.2.9" + self.by-version."director"."1.1.10" + self.by-version."pkginfo"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - full."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."follow-redirects"."0.0.3" = + self.by-version."follow-redirects"."0.0.3"; + by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "follow-redirects-0.0.3"; src = [ (fetchurl { @@ -4032,15 +3668,17 @@ }) ]; buildInputs = - (self.nativeDeps."follow-redirects"."0.0.3" or []); + (self.nativeDeps."follow-redirects" or []); deps = [ - self.full."underscore"."*" + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "follow-redirects" ]; }; - full."forEachAsync"."~2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."forEachAsync"."~2.2" = + self.by-version."forEachAsync"."2.2.0"; + by-version."forEachAsync"."2.2.0" = lib.makeOverridable self.buildNodePackage { name = "forEachAsync-2.2.0"; src = [ (fetchurl { @@ -4049,15 +3687,17 @@ }) ]; buildInputs = - (self.nativeDeps."forEachAsync"."~2.2" or []); + (self.nativeDeps."forEachAsync" or []); deps = [ - self.full."sequence".">= 2.2.1" + self.by-version."sequence"."2.2.1" ]; peerDependencies = [ ]; passthru.names = [ "forEachAsync" ]; }; - full."forever"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."forever"."*" = + self.by-version."forever"."0.10.9"; + by-version."forever"."0.10.9" = lib.makeOverridable self.buildNodePackage { name = "forever-0.10.9"; src = [ (fetchurl { @@ -4066,27 +3706,29 @@ }) ]; buildInputs = - (self.nativeDeps."forever"."*" or []); + (self.nativeDeps."forever" or []); deps = [ - self.full."colors"."0.6.0-1" - self.full."cliff"."0.1.8" - self.full."flatiron"."0.3.5" - self.full."forever-monitor"."1.2.3" - self.full."nconf"."0.6.7" - self.full."nssocket"."~0.5.1" - self.full."optimist"."0.4.0" - self.full."pkginfo"."0.3.0" - self.full."timespan"."2.0.1" - self.full."watch"."0.7.0" - self.full."utile"."0.1.7" - self.full."winston"."0.7.1" + self.by-version."colors"."0.6.0-1" + self.by-version."cliff"."0.1.8" + self.by-version."flatiron"."0.3.5" + self.by-version."forever-monitor"."1.2.3" + self.by-version."nconf"."0.6.7" + self.by-version."nssocket"."0.5.1" + self.by-version."optimist"."0.4.0" + self.by-version."pkginfo"."0.3.0" + self.by-version."timespan"."2.0.1" + self.by-version."watch"."0.7.0" + self.by-version."utile"."0.1.7" + self.by-version."winston"."0.7.1" ]; peerDependencies = [ ]; passthru.names = [ "forever" ]; }; - "forever" = self.full."forever"."*"; - full."forever-agent"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + "forever" = self.by-version."forever"."0.10.9"; + by-spec."forever-agent"."~0.2.0" = + self.by-version."forever-agent"."0.2.0"; + by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "forever-agent-0.2.0"; src = [ (fetchurl { @@ -4095,14 +3737,16 @@ }) ]; buildInputs = - (self.nativeDeps."forever-agent"."~0.2.0" or []); + (self.nativeDeps."forever-agent" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "forever-agent" ]; }; - full."forever-agent"."~0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.0"; + by-version."forever-agent"."0.5.0" = lib.makeOverridable self.buildNodePackage { name = "forever-agent-0.5.0"; src = [ (fetchurl { @@ -4111,14 +3755,16 @@ }) ]; buildInputs = - (self.nativeDeps."forever-agent"."~0.5.0" or []); + (self.nativeDeps."forever-agent" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "forever-agent" ]; }; - full."forever-monitor"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."forever-monitor"."*" = + self.by-version."forever-monitor"."1.2.3"; + by-version."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "forever-monitor-1.2.3"; src = [ (fetchurl { @@ -4127,21 +3773,23 @@ }) ]; buildInputs = - (self.nativeDeps."forever-monitor"."*" or []); + (self.nativeDeps."forever-monitor" or []); deps = [ - self.full."broadway"."0.2.x" - self.full."minimatch"."0.2.x" - self.full."pkginfo"."0.x.x" - self.full."ps-tree"."0.0.x" - self.full."watch"."0.5.x" - self.full."utile"."0.1.x" + self.by-version."broadway"."0.2.7" + self.by-version."minimatch"."0.2.12" + self.by-version."pkginfo"."0.3.0" + self.by-version."ps-tree"."0.0.3" + self.by-version."watch"."0.5.1" + self.by-version."utile"."0.1.7" ]; peerDependencies = [ ]; passthru.names = [ "forever-monitor" ]; }; - "forever-monitor" = self.full."forever-monitor"."*"; - full."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage { + "forever-monitor" = self.by-version."forever-monitor"."1.2.3"; + by-spec."forever-monitor"."1.1.0" = + self.by-version."forever-monitor"."1.1.0"; + by-version."forever-monitor"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "forever-monitor-1.1.0"; src = [ (fetchurl { @@ -4150,42 +3798,24 @@ }) ]; buildInputs = - (self.nativeDeps."forever-monitor"."1.1.0" or []); + (self.nativeDeps."forever-monitor" or []); deps = [ - self.full."broadway"."0.2.x" - self.full."minimatch"."0.0.x" - self.full."pkginfo"."0.x.x" - self.full."ps-tree"."0.0.x" - self.full."watch"."0.5.x" - self.full."utile"."0.1.x" + self.by-version."broadway"."0.2.7" + self.by-version."minimatch"."0.0.5" + self.by-version."pkginfo"."0.3.0" + self.by-version."ps-tree"."0.0.3" + self.by-version."watch"."0.5.1" + self.by-version."utile"."0.1.7" ]; peerDependencies = [ ]; passthru.names = [ "forever-monitor" ]; }; - full."forever-monitor"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "forever-monitor-1.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.3.tgz"; - sha1 = "b27ac3acb6fdcc7315d6cd85830f2d004733028b"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-monitor"."1.2.3" or []); - deps = [ - self.full."broadway"."0.2.x" - self.full."minimatch"."0.2.x" - self.full."pkginfo"."0.x.x" - self.full."ps-tree"."0.0.x" - self.full."watch"."0.5.x" - self.full."utile"."0.1.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "forever-monitor" ]; - }; - full."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage { + by-spec."forever-monitor"."1.2.3" = + self.by-version."forever-monitor"."1.2.3"; + by-spec."form-data"."0.0.8" = + self.by-version."form-data"."0.0.8"; + by-version."form-data"."0.0.8" = lib.makeOverridable self.buildNodePackage { name = "form-data-0.0.8"; src = [ (fetchurl { @@ -4194,17 +3824,19 @@ }) ]; buildInputs = - (self.nativeDeps."form-data"."0.0.8" or []); + (self.nativeDeps."form-data" or []); deps = [ - self.full."combined-stream"."~0.0.4" - self.full."mime"."~1.2.2" - self.full."async"."~0.2.7" + self.by-version."combined-stream"."0.0.4" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.2.9" ]; peerDependencies = [ ]; passthru.names = [ "form-data" ]; }; - full."form-data"."~0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."form-data"."~0.0.3" = + self.by-version."form-data"."0.0.10"; + by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage { name = "form-data-0.0.10"; src = [ (fetchurl { @@ -4213,17 +3845,19 @@ }) ]; buildInputs = - (self.nativeDeps."form-data"."~0.0.3" or []); + (self.nativeDeps."form-data" or []); deps = [ - self.full."combined-stream"."~0.0.4" - self.full."mime"."~1.2.2" - self.full."async"."~0.2.7" + self.by-version."combined-stream"."0.0.4" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.2.9" ]; peerDependencies = [ ]; passthru.names = [ "form-data" ]; }; - full."form-data"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.2"; + by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "form-data-0.1.2"; src = [ (fetchurl { @@ -4232,17 +3866,19 @@ }) ]; buildInputs = - (self.nativeDeps."form-data"."~0.1.0" or []); + (self.nativeDeps."form-data" or []); deps = [ - self.full."combined-stream"."~0.0.4" - self.full."mime"."~1.2.11" - self.full."async"."~0.2.9" + self.by-version."combined-stream"."0.0.4" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.2.9" ]; peerDependencies = [ ]; passthru.names = [ "form-data" ]; }; - full."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage { + by-spec."formidable"."1.0.11" = + self.by-version."formidable"."1.0.11"; + by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage { name = "formidable-1.0.11"; src = [ (fetchurl { @@ -4251,14 +3887,16 @@ }) ]; buildInputs = - (self.nativeDeps."formidable"."1.0.11" or []); + (self.nativeDeps."formidable" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "formidable" ]; }; - full."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage { + by-spec."formidable"."1.0.13" = + self.by-version."formidable"."1.0.13"; + by-version."formidable"."1.0.13" = lib.makeOverridable self.buildNodePackage { name = "formidable-1.0.13"; src = [ (fetchurl { @@ -4267,14 +3905,16 @@ }) ]; buildInputs = - (self.nativeDeps."formidable"."1.0.13" or []); + (self.nativeDeps."formidable" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "formidable" ]; }; - full."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage { + by-spec."formidable"."1.0.14" = + self.by-version."formidable"."1.0.14"; + by-version."formidable"."1.0.14" = lib.makeOverridable self.buildNodePackage { name = "formidable-1.0.14"; src = [ (fetchurl { @@ -4283,14 +3923,16 @@ }) ]; buildInputs = - (self.nativeDeps."formidable"."1.0.14" or []); + (self.nativeDeps."formidable" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "formidable" ]; }; - full."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage { + by-spec."formidable"."1.0.9" = + self.by-version."formidable"."1.0.9"; + by-version."formidable"."1.0.9" = lib.makeOverridable self.buildNodePackage { name = "formidable-1.0.9"; src = [ (fetchurl { @@ -4299,30 +3941,18 @@ }) ]; buildInputs = - (self.nativeDeps."formidable"."1.0.9" or []); + (self.nativeDeps."formidable" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "formidable" ]; }; - full."formidable"."1.0.x" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.14"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }) - ]; - buildInputs = - (self.nativeDeps."formidable"."1.0.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "formidable" ]; - }; - full."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."formidable"."1.0.x" = + self.by-version."formidable"."1.0.14"; + by-spec."fresh"."0.1.0" = + self.by-version."fresh"."0.1.0"; + by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "fresh-0.1.0"; src = [ (fetchurl { @@ -4331,14 +3961,16 @@ }) ]; buildInputs = - (self.nativeDeps."fresh"."0.1.0" or []); + (self.nativeDeps."fresh" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "fresh" ]; }; - full."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."fresh"."0.2.0" = + self.by-version."fresh"."0.2.0"; + by-version."fresh"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "fresh-0.2.0"; src = [ (fetchurl { @@ -4347,14 +3979,16 @@ }) ]; buildInputs = - (self.nativeDeps."fresh"."0.2.0" or []); + (self.nativeDeps."fresh" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "fresh" ]; }; - full."fs-walk"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."fs-walk"."*" = + self.by-version."fs-walk"."0.0.1"; + by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "fs-walk-0.0.1"; src = [ (fetchurl { @@ -4363,16 +3997,18 @@ }) ]; buildInputs = - (self.nativeDeps."fs-walk"."*" or []); + (self.nativeDeps."fs-walk" or []); deps = [ - self.full."async"."*" + self.by-version."async"."0.2.9" ]; peerDependencies = [ ]; passthru.names = [ "fs-walk" ]; }; - "fs-walk" = self.full."fs-walk"."*"; - full."fstream"."0" = lib.makeOverridable self.buildNodePackage { + "fs-walk" = self.by-version."fs-walk"."0.0.1"; + by-spec."fstream"."0" = + self.by-version."fstream"."0.1.24"; + by-version."fstream"."0.1.24" = lib.makeOverridable self.buildNodePackage { name = "fstream-0.1.24"; src = [ (fetchurl { @@ -4381,118 +4017,30 @@ }) ]; buildInputs = - (self.nativeDeps."fstream"."0" or []); + (self.nativeDeps."fstream" or []); deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" + self.by-version."rimraf"."2.2.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."graceful-fs"."2.0.1" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "fstream" ]; }; - full."fstream"."~0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream"."~0.1.17" or []); - deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - full."fstream"."~0.1.21" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream"."~0.1.21" or []); - deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - full."fstream"."~0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream"."~0.1.22" or []); - deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - full."fstream"."~0.1.23" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream"."~0.1.23" or []); - deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - full."fstream"."~0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.24"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; - sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream"."~0.1.8" or []); - deps = [ - self.full."rimraf"."2" - self.full."mkdirp"."0.3" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."~2.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - full."fstream-ignore"."~0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."fstream"."~0.1.17" = + self.by-version."fstream"."0.1.24"; + by-spec."fstream"."~0.1.21" = + self.by-version."fstream"."0.1.24"; + by-spec."fstream"."~0.1.22" = + self.by-version."fstream"."0.1.24"; + by-spec."fstream"."~0.1.23" = + self.by-version."fstream"."0.1.24"; + by-spec."fstream"."~0.1.8" = + self.by-version."fstream"."0.1.24"; + by-spec."fstream-ignore"."~0.0.5" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { name = "fstream-ignore-0.0.7"; src = [ (fetchurl { @@ -4501,36 +4049,21 @@ }) ]; buildInputs = - (self.nativeDeps."fstream-ignore"."~0.0.5" or []); + (self.nativeDeps."fstream-ignore" or []); deps = [ - self.full."minimatch"."~0.2.0" - self.full."fstream"."~0.1.17" - self.full."inherits"."2" + self.by-version."minimatch"."0.2.12" + self.by-version."fstream"."0.1.24" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; - full."fstream-ignore"."~0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "fstream-ignore-0.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; - sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream-ignore"."~0.0.6" or []); - deps = [ - self.full."minimatch"."~0.2.0" - self.full."fstream"."~0.1.17" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fstream-ignore" ]; - }; - full."fstream-npm"."~0.1.3" = lib.makeOverridable self.buildNodePackage { + by-spec."fstream-ignore"."~0.0.6" = + self.by-version."fstream-ignore"."0.0.7"; + by-spec."fstream-npm"."~0.1.6" = + self.by-version."fstream-npm"."0.1.6"; + by-version."fstream-npm"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "fstream-npm-0.1.6"; src = [ (fetchurl { @@ -4539,54 +4072,60 @@ }) ]; buildInputs = - (self.nativeDeps."fstream-npm"."~0.1.3" or []); + (self.nativeDeps."fstream-npm" or []); deps = [ - self.full."fstream-ignore"."~0.0.5" - self.full."inherits"."2" + self.by-version."fstream-ignore"."0.0.7" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "fstream-npm" ]; }; - full."generator-angular"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.5.0"; + by-spec."generator-angular"."*" = + self.by-version."generator-angular"."0.5.1"; + by-version."generator-angular"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.5.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.5.0.tgz"; - sha1 = "f637a6c42984fd949678358be369e413a2e7c6e2"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.5.1.tgz"; + sha1 = "b7cd8ef2aaec9cdd4d9d792bf38ff74bb8971cc8"; }) ]; buildInputs = - (self.nativeDeps."generator-angular"."*" or []); + (self.nativeDeps."generator-angular" or []); deps = [ - self.full."yeoman-generator"."~0.13.0" + self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.full."generator-karma"."~0.5.0" - self.full."yo".">=1.0.0-rc.1.1" + self.by-version."generator-karma"."0.6.0" + self.by-version."yo"."1.0.4" ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.full."generator-angular"."*"; - full."generator-karma"."~0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "generator-karma-0.5.0"; + "generator-angular" = self.by-version."generator-angular"."0.5.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 = "generator-karma-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.5.0.tgz"; - sha1 = "3b9dc1154e232a135c0e4598834540977038617d"; + url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.6.0.tgz"; + sha1 = "e89b6195c186771e8bdddde37441abb6ce07e1a0"; }) ]; buildInputs = - (self.nativeDeps."generator-karma"."~0.5.0" or []); + (self.nativeDeps."generator-karma" or []); deps = [ - self.full."yeoman-generator"."~0.13.0" + self.by-version."yeoman-generator"."0.13.4" ]; peerDependencies = [ - self.full."yo".">=1.0.0-rc.1.1" + self.by-version."yo"."1.0.4" ]; passthru.names = [ "generator-karma" ]; }; - full."generator-mocha"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."generator-mocha"."~0.1.1" = + self.by-version."generator-mocha"."0.1.1"; + by-version."generator-mocha"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "generator-mocha-0.1.1"; src = [ (fetchurl { @@ -4595,15 +4134,17 @@ }) ]; buildInputs = - (self.nativeDeps."generator-mocha"."~0.1.1" or []); + (self.nativeDeps."generator-mocha" or []); deps = [ - self.full."yeoman-generator"."~0.10.0" + self.by-version."yeoman-generator"."0.10.5" ]; peerDependencies = [ ]; passthru.names = [ "generator-mocha" ]; }; - full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."generator-webapp"."*" = + self.by-version."generator-webapp"."0.4.3"; + by-version."generator-webapp"."0.4.3" = lib.makeOverridable self.buildNodePackage { name = "generator-webapp-0.4.3"; src = [ (fetchurl { @@ -4612,38 +4153,40 @@ }) ]; buildInputs = - (self.nativeDeps."generator-webapp"."*" or []); + (self.nativeDeps."generator-webapp" or []); deps = [ - self.full."yeoman-generator"."~0.13.1" - self.full."cheerio"."~0.12.1" + self.by-version."yeoman-generator"."0.13.4" + self.by-version."cheerio"."0.12.3" ]; peerDependencies = [ - self.full."yo".">=1.0.0-rc.1.1" - self.full."generator-mocha"."~0.1.1" + self.by-version."yo"."1.0.4" + self.by-version."generator-mocha"."0.1.1" ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.full."generator-webapp"."*"; - full."getmac"."~1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "getmac-1.0.5"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.3"; + by-spec."getmac"."~1.0.6" = + self.by-version."getmac"."1.0.6"; + by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "getmac-1.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/getmac/-/getmac-1.0.5.tgz"; - sha1 = "4ce0468a83e5fc2f2d337fc0c3c9be2c94a6344f"; + url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz"; + sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522"; }) ]; buildInputs = - (self.nativeDeps."getmac"."~1.0.5" or []); + (self.nativeDeps."getmac" or []); deps = [ - self.full."extract-opts"."~2.2.0" - self.full."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0" - self.full."joe-reporter-console"."~1.2.1" + self.by-version."extract-opts"."2.2.0" ]; peerDependencies = [ ]; passthru.names = [ "getmac" ]; }; - full."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."github-url-from-git"."1.1.1" = + self.by-version."github-url-from-git"."1.1.1"; + by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "github-url-from-git-1.1.1"; src = [ (fetchurl { @@ -4652,30 +4195,36 @@ }) ]; buildInputs = - (self.nativeDeps."github-url-from-git"."1.1.1" or []); + (self.nativeDeps."github-url-from-git" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "github-url-from-git" ]; }; - full."github-url-from-git"."~1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-git-1.1.1"; + by-spec."github-url-from-git"."~1.1.1" = + self.by-version."github-url-from-git"."1.1.1"; + by-spec."github-url-from-username-repo"."0.0.2" = + self.by-version."github-url-from-username-repo"."0.0.2"; + by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-username-repo-0.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; - sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; + url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; + sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; }) ]; buildInputs = - (self.nativeDeps."github-url-from-git"."~1.1.1" or []); + (self.nativeDeps."github-url-from-username-repo" or []); deps = [ ]; peerDependencies = [ ]; - passthru.names = [ "github-url-from-git" ]; + passthru.names = [ "github-url-from-username-repo" ]; }; - full."glob"."3" = lib.makeOverridable self.buildNodePackage { + by-spec."glob"."3" = + self.by-version."glob"."3.2.6"; + by-version."glob"."3.2.6" = lib.makeOverridable self.buildNodePackage { name = "glob-3.2.6"; src = [ (fetchurl { @@ -4684,16 +4233,18 @@ }) ]; buildInputs = - (self.nativeDeps."glob"."3" or []); + (self.nativeDeps."glob" or []); deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" + self.by-version."minimatch"."0.2.12" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "glob" ]; }; - full."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."glob"."3.2.3" = + self.by-version."glob"."3.2.3"; + by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { name = "glob-3.2.3"; src = [ (fetchurl { @@ -4702,53 +4253,23 @@ }) ]; buildInputs = - (self.nativeDeps."glob"."3.2.3" or []); + (self.nativeDeps."glob" or []); deps = [ - self.full."minimatch"."~0.2.11" - self.full."graceful-fs"."~2.0.0" - self.full."inherits"."2" + self.by-version."minimatch"."0.2.12" + self.by-version."graceful-fs"."2.0.1" + self.by-version."inherits"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "glob" ]; }; - full."glob"."3.x" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; - }) - ]; - buildInputs = - (self.nativeDeps."glob"."3.x" or []); - deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - full."glob".">= 3.1.4" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; - }) - ]; - buildInputs = - (self.nativeDeps."glob".">= 3.1.4" or []); - deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - full."glob"."~3.1.21" = lib.makeOverridable self.buildNodePackage { + by-spec."glob"."3.x" = + self.by-version."glob"."3.2.6"; + by-spec."glob".">= 3.1.4" = + self.by-version."glob"."3.2.6"; + by-spec."glob"."~3.1.21" = + self.by-version."glob"."3.1.21"; + by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { name = "glob-3.1.21"; src = [ (fetchurl { @@ -4757,87 +4278,25 @@ }) ]; buildInputs = - (self.nativeDeps."glob"."~3.1.21" or []); + (self.nativeDeps."glob" or []); deps = [ - self.full."minimatch"."~0.2.11" - self.full."graceful-fs"."~1.2.0" - self.full."inherits"."1" + self.by-version."minimatch"."0.2.12" + self.by-version."graceful-fs"."1.2.3" + self.by-version."inherits"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "glob" ]; }; - full."glob"."~3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; - }) - ]; - buildInputs = - (self.nativeDeps."glob"."~3.2.0" or []); - deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - full."glob"."~3.2.1" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; - }) - ]; - buildInputs = - (self.nativeDeps."glob"."~3.2.1" or []); - deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - full."glob"."~3.2.6" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; - }) - ]; - buildInputs = - (self.nativeDeps."glob"."~3.2.6" or []); - deps = [ - self.full."minimatch"."~0.2.11" - self.full."inherits"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - full."graceful-fs"."1.2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."1.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."glob"."~3.2.0" = + self.by-version."glob"."3.2.6"; + by-spec."glob"."~3.2.1" = + self.by-version."glob"."3.2.6"; + by-spec."glob"."~3.2.6" = + self.by-version."glob"."3.2.6"; + by-spec."graceful-fs"."2" = + self.by-version."graceful-fs"."2.0.1"; + by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-2.0.1"; src = [ (fetchurl { @@ -4846,14 +4305,16 @@ }) ]; buildInputs = - (self.nativeDeps."graceful-fs"."2" or []); + (self.nativeDeps."graceful-fs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; }; - full."graceful-fs"."~1" = lib.makeOverridable self.buildNodePackage { + by-spec."graceful-fs"."~1" = + self.by-version."graceful-fs"."1.2.3"; + by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-1.2.3"; src = [ (fetchurl { @@ -4862,14 +4323,16 @@ }) ]; buildInputs = - (self.nativeDeps."graceful-fs"."~1" or []); + (self.nativeDeps."graceful-fs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; }; - full."graceful-fs"."~1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."graceful-fs"."~1.1" = + self.by-version."graceful-fs"."1.1.14"; + by-version."graceful-fs"."1.1.14" = lib.makeOverridable self.buildNodePackage { name = "graceful-fs-1.1.14"; src = [ (fetchurl { @@ -4878,94 +4341,24 @@ }) ]; buildInputs = - (self.nativeDeps."graceful-fs"."~1.1" or []); + (self.nativeDeps."graceful-fs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; }; - full."graceful-fs"."~1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."~1.2.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."graceful-fs"."~1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."~1.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."graceful-fs"."~1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."~1.2.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; - sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."~2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."graceful-fs"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; - sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs"."~2.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - full."gridfs-stream"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."graceful-fs"."~1.2.0" = + self.by-version."graceful-fs"."1.2.3"; + by-spec."graceful-fs"."~1.2.1" = + self.by-version."graceful-fs"."1.2.3"; + by-spec."graceful-fs"."~2" = + self.by-version."graceful-fs"."2.0.1"; + by-spec."graceful-fs"."~2.0.0" = + self.by-version."graceful-fs"."2.0.1"; + by-spec."gridfs-stream"."*" = + self.by-version."gridfs-stream"."0.4.0"; + by-version."gridfs-stream"."0.4.0" = lib.makeOverridable self.buildNodePackage { name = "gridfs-stream-0.4.0"; src = [ (fetchurl { @@ -4974,15 +4367,17 @@ }) ]; buildInputs = - (self.nativeDeps."gridfs-stream"."*" or []); + (self.nativeDeps."gridfs-stream" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "gridfs-stream" ]; }; - "gridfs-stream" = self.full."gridfs-stream"."*"; - full."growl"."1.7.x" = lib.makeOverridable self.buildNodePackage { + "gridfs-stream" = self.by-version."gridfs-stream"."0.4.0"; + by-spec."growl"."1.7.x" = + self.by-version."growl"."1.7.0"; + by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage { name = "growl-1.7.0"; src = [ (fetchurl { @@ -4991,14 +4386,16 @@ }) ]; buildInputs = - (self.nativeDeps."growl"."1.7.x" or []); + (self.nativeDeps."growl" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "growl" ]; }; - full."grunt"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."grunt"."0.4.x" = + self.by-version."grunt"."0.4.1"; + by-version."grunt"."0.4.1" = lib.makeOverridable self.buildNodePackage { name = "grunt-0.4.1"; src = [ (fetchurl { @@ -5007,192 +4404,127 @@ }) ]; buildInputs = - (self.nativeDeps."grunt"."0.4.x" or []); + (self.nativeDeps."grunt" or []); deps = [ - self.full."async"."~0.1.22" - self.full."coffee-script"."~1.3.3" - self.full."colors"."~0.6.0-1" - self.full."dateformat"."1.0.2-1.2.3" - self.full."eventemitter2"."~0.4.9" - self.full."findup-sync"."~0.1.0" - self.full."glob"."~3.1.21" - self.full."hooker"."~0.2.3" - self.full."iconv-lite"."~0.2.5" - self.full."minimatch"."~0.2.6" - self.full."nopt"."~1.0.10" - self.full."rimraf"."~2.0.2" - self.full."lodash"."~0.9.0" - self.full."underscore.string"."~2.2.0rc" - self.full."which"."~1.0.5" - self.full."js-yaml"."~2.0.2" + self.by-version."async"."0.1.22" + self.by-version."coffee-script"."1.3.3" + 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."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.12" + self.by-version."nopt"."1.0.10" + self.by-version."rimraf"."2.0.3" + 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" ]; peerDependencies = [ ]; passthru.names = [ "grunt" ]; }; - full."grunt"."~0.4" = lib.makeOverridable self.buildNodePackage { - name = "grunt-0.4.1"; + by-spec."grunt"."~0.4" = + self.by-version."grunt"."0.4.1"; + by-spec."grunt"."~0.4.0" = + self.by-version."grunt"."0.4.1"; + by-spec."grunt"."~0.4.1" = + self.by-version."grunt"."0.4.1"; + by-spec."grunt-cli"."*" = + self.by-version."grunt-cli"."0.1.10"; + by-version."grunt-cli"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "grunt-cli-0.1.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz"; - sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729"; + url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.10.tgz"; + sha1 = "cba4bdab74df4336f5ba7335a9f22d97a1f2dd3a"; }) ]; buildInputs = - (self.nativeDeps."grunt"."~0.4" or []); + (self.nativeDeps."grunt-cli" or []); deps = [ - self.full."async"."~0.1.22" - self.full."coffee-script"."~1.3.3" - self.full."colors"."~0.6.0-1" - self.full."dateformat"."1.0.2-1.2.3" - self.full."eventemitter2"."~0.4.9" - self.full."findup-sync"."~0.1.0" - self.full."glob"."~3.1.21" - self.full."hooker"."~0.2.3" - self.full."iconv-lite"."~0.2.5" - self.full."minimatch"."~0.2.6" - self.full."nopt"."~1.0.10" - self.full."rimraf"."~2.0.2" - self.full."lodash"."~0.9.0" - self.full."underscore.string"."~2.2.0rc" - self.full."which"."~1.0.5" - self.full."js-yaml"."~2.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "grunt" ]; - }; - full."grunt"."~0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "grunt-0.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grunt/-/grunt-0.4.1.tgz"; - sha1 = "d5892e5680add9ed1befde9aa635cf46b8f49729"; - }) - ]; - buildInputs = - (self.nativeDeps."grunt"."~0.4.0" or []); - deps = [ - self.full."async"."~0.1.22" - self.full."coffee-script"."~1.3.3" - self.full."colors"."~0.6.0-1" - self.full."dateformat"."1.0.2-1.2.3" - self.full."eventemitter2"."~0.4.9" - self.full."findup-sync"."~0.1.0" - self.full."glob"."~3.1.21" - self.full."hooker"."~0.2.3" - self.full."iconv-lite"."~0.2.5" - self.full."minimatch"."~0.2.6" - self.full."nopt"."~1.0.10" - self.full."rimraf"."~2.0.2" - self.full."lodash"."~0.9.0" - self.full."underscore.string"."~2.2.0rc" - self.full."which"."~1.0.5" - self.full."js-yaml"."~2.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "grunt" ]; - }; - full."grunt-cli"."*" = lib.makeOverridable self.buildNodePackage { - name = "grunt-cli-0.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.9.tgz"; - sha1 = "3f08bfb0bef30ba33083defe53efe0575cbe4e14"; - }) - ]; - buildInputs = - (self.nativeDeps."grunt-cli"."*" or []); - deps = [ - self.full."nopt"."~1.0.10" - self.full."findup-sync"."~0.1.0" - self.full."resolve"."~0.3.1" + self.by-version."nopt"."1.0.10" + self.by-version."findup-sync"."0.1.2" + self.by-version."resolve"."0.3.1" ]; peerDependencies = [ ]; passthru.names = [ "grunt-cli" ]; }; - "grunt-cli" = self.full."grunt-cli"."*"; - full."grunt-cli"."~0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "grunt-cli-0.1.9"; + "grunt-cli" = self.by-version."grunt-cli"."0.1.10"; + by-spec."grunt-cli"."~0.1.7" = + self.by-version."grunt-cli"."0.1.10"; + by-spec."grunt-contrib-cssmin"."*" = + self.by-version."grunt-contrib-cssmin"."0.7.0"; + by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-cssmin-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.9.tgz"; - sha1 = "3f08bfb0bef30ba33083defe53efe0575cbe4e14"; + url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.7.0.tgz"; + sha1 = "a5735e9f1d263149e49fe035294e429d8c670bab"; }) ]; buildInputs = - (self.nativeDeps."grunt-cli"."~0.1.7" or []); + (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.full."nopt"."~1.0.10" - self.full."findup-sync"."~0.1.0" - self.full."resolve"."~0.3.1" + self.by-version."clean-css"."2.0.0" + self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - ]; - passthru.names = [ "grunt-cli" ]; - }; - full."grunt-contrib-cssmin"."*" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-cssmin-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.6.2.tgz"; - sha1 = "2804dc0e81f98e8a54d61eee84a1d3fe1a3af8e2"; - }) - ]; - buildInputs = - (self.nativeDeps."grunt-contrib-cssmin"."*" or []); - deps = [ - self.full."clean-css"."~1.1.1" - self.full."grunt-lib-contrib"."~0.6.0" - ]; - peerDependencies = [ - self.full."grunt"."~0.4.0" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-contrib-cssmin" ]; }; - "grunt-contrib-cssmin" = self.full."grunt-contrib-cssmin"."*"; - full."grunt-contrib-jshint"."*" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-jshint-0.6.4"; + "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.7.0"; + by-spec."grunt-contrib-jshint"."*" = + self.by-version."grunt-contrib-jshint"."0.7.1"; + by-version."grunt-contrib-jshint"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-jshint-0.7.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.6.4.tgz"; - sha1 = "c5a0e56c13d3f758cf1b5d0786dcb4a7d4b4d748"; + url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.7.1.tgz"; + sha1 = "b636e1100b5804c4be56ad88d8a574ef0637d97a"; }) ]; buildInputs = - (self.nativeDeps."grunt-contrib-jshint"."*" or []); + (self.nativeDeps."grunt-contrib-jshint" or []); deps = [ - self.full."jshint"."~2.1.10" + self.by-version."jshint"."2.3.0" ]; peerDependencies = [ - self.full."grunt"."~0.4.0" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-contrib-jshint" ]; }; - "grunt-contrib-jshint" = self.full."grunt-contrib-jshint"."*"; - full."grunt-contrib-less"."*" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.7.0"; + "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.1"; + by-spec."grunt-contrib-less"."*" = + self.by-version."grunt-contrib-less"."0.8.1"; + by-version."grunt-contrib-less"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-less-0.8.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.7.0.tgz"; - sha1 = "35f6513e47ec5f3c99188d46efa9dcf378207be8"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.1.tgz"; + sha1 = "0b819ebcadf737177fc7b9c4a239ed9d5834fbe4"; }) ]; buildInputs = - (self.nativeDeps."grunt-contrib-less"."*" or []); + (self.nativeDeps."grunt-contrib-less" or []); deps = [ - self.full."less"."~1.4.0" - self.full."grunt-lib-contrib"."~0.6.1" + self.by-version."less"."1.5.0" + self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - self.full."grunt"."~0.4.0" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.full."grunt-contrib-less"."*"; - full."grunt-contrib-requirejs"."*" = lib.makeOverridable self.buildNodePackage { + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.1"; + by-spec."grunt-contrib-requirejs"."*" = + self.by-version."grunt-contrib-requirejs"."0.4.1"; + by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { name = "grunt-contrib-requirejs-0.4.1"; src = [ (fetchurl { @@ -5201,37 +4533,41 @@ }) ]; buildInputs = - (self.nativeDeps."grunt-contrib-requirejs"."*" or []); + (self.nativeDeps."grunt-contrib-requirejs" or []); deps = [ - self.full."requirejs"."~2.1.0" + self.by-version."requirejs"."2.1.9" ]; peerDependencies = [ - self.full."grunt"."~0.4.0" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-contrib-requirejs" ]; }; - "grunt-contrib-requirejs" = self.full."grunt-contrib-requirejs"."*"; - full."grunt-contrib-uglify"."*" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-uglify-0.2.4"; + "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; + by-spec."grunt-contrib-uglify"."*" = + self.by-version."grunt-contrib-uglify"."0.2.5"; + by-version."grunt-contrib-uglify"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-uglify-0.2.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.4.tgz"; - sha1 = "51113f28a72432521e35e63f7f18a251fda2fd49"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.5.tgz"; + sha1 = "fd8bd7cb4ff809630ae864aaf40dea64dea5b15c"; }) ]; buildInputs = - (self.nativeDeps."grunt-contrib-uglify"."*" or []); + (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.full."uglify-js"."~2.4.0" - self.full."grunt-lib-contrib"."~0.6.1" + self.by-version."uglify-js"."2.4.2" + self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ - self.full."grunt"."~0.4.0" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.full."grunt-contrib-uglify"."*"; - full."grunt-karma"."*" = lib.makeOverridable self.buildNodePackage { + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.5"; + by-spec."grunt-karma"."*" = + self.by-version."grunt-karma"."0.7.1"; + by-version."grunt-karma"."0.7.1" = lib.makeOverridable self.buildNodePackage { name = "grunt-karma-0.7.1"; src = [ (fetchurl { @@ -5240,18 +4576,20 @@ }) ]; buildInputs = - (self.nativeDeps."grunt-karma"."*" or []); + (self.nativeDeps."grunt-karma" or []); deps = [ - self.full."optimist"."~0.6.0" + self.by-version."optimist"."0.6.0" ]; peerDependencies = [ - self.full."grunt"."0.4.x" - self.full."karma"."~0.10.0" + self.by-version."grunt"."0.4.1" + self.by-version."karma"."0.10.4" ]; passthru.names = [ "grunt-karma" ]; }; - "grunt-karma" = self.full."grunt-karma"."*"; - full."grunt-lib-contrib"."~0.6.0" = lib.makeOverridable self.buildNodePackage { + "grunt-karma" = self.by-version."grunt-karma"."0.7.1"; + by-spec."grunt-lib-contrib"."~0.6.0" = + self.by-version."grunt-lib-contrib"."0.6.1"; + by-version."grunt-lib-contrib"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "grunt-lib-contrib-0.6.1"; src = [ (fetchurl { @@ -5260,32 +4598,19 @@ }) ]; buildInputs = - (self.nativeDeps."grunt-lib-contrib"."~0.6.0" or []); + (self.nativeDeps."grunt-lib-contrib" or []); deps = [ - self.full."zlib-browserify"."0.0.1" + self.by-version."zlib-browserify"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "grunt-lib-contrib" ]; }; - full."grunt-lib-contrib"."~0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-lib-contrib-0.6.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/grunt-lib-contrib/-/grunt-lib-contrib-0.6.1.tgz"; - sha1 = "3f56adb7da06e814795ee2415b0ebe5fb8903ebb"; - }) - ]; - buildInputs = - (self.nativeDeps."grunt-lib-contrib"."~0.6.1" or []); - deps = [ - self.full."zlib-browserify"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "grunt-lib-contrib" ]; - }; - full."grunt-sed"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."grunt-lib-contrib"."~0.6.1" = + self.by-version."grunt-lib-contrib"."0.6.1"; + by-spec."grunt-sed"."*" = + self.by-version."grunt-sed"."0.1.1"; + by-version."grunt-sed"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "grunt-sed-0.1.1"; src = [ (fetchurl { @@ -5294,17 +4619,19 @@ }) ]; buildInputs = - (self.nativeDeps."grunt-sed"."*" or []); + (self.nativeDeps."grunt-sed" or []); deps = [ - self.full."replace"."~0.2.4" + self.by-version."replace"."0.2.7" ]; peerDependencies = [ - self.full."grunt"."~0.4" + self.by-version."grunt"."0.4.1" ]; passthru.names = [ "grunt-sed" ]; }; - "grunt-sed" = self.full."grunt-sed"."*"; - full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = lib.makeOverridable self.buildNodePackage { + "grunt-sed" = self.by-version."grunt-sed"."0.1.1"; + by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = + self.by-version."guifi-earth"."0.2.1"; + by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "guifi-earth-0.2.1"; src = [ (fetchurl { @@ -5313,20 +4640,22 @@ }) ]; buildInputs = - (self.nativeDeps."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " or []); + (self.nativeDeps."guifi-earth" or []); deps = [ - self.full."coffee-script".">= 0.0.1" - self.full."jade".">= 0.0.1" - self.full."q".">= 0.0.1" - self.full."xml2js".">= 0.0.1" - self.full."msgpack".">= 0.0.1" + self.by-version."coffee-script"."1.6.3" + self.by-version."jade"."0.35.0" + self.by-version."q"."0.9.7" + self.by-version."xml2js"."0.2.8" + self.by-version."msgpack"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "guifi-earth" ]; }; - "guifi-earth" = self.full."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 "; - full."gzippo"."*" = lib.makeOverridable self.buildNodePackage { + "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; + by-spec."gzippo"."*" = + self.by-version."gzippo"."0.2.0"; + by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "gzippo-0.2.0"; src = [ (fetchurl { @@ -5335,16 +4664,18 @@ }) ]; buildInputs = - (self.nativeDeps."gzippo"."*" or []); + (self.nativeDeps."gzippo" or []); deps = [ - self.full."send"."*" + self.by-version."send"."0.1.4" ]; peerDependencies = [ ]; passthru.names = [ "gzippo" ]; }; - "gzippo" = self.full."gzippo"."*"; - full."handlebars"."1.0.x" = lib.makeOverridable self.buildNodePackage { + "gzippo" = self.by-version."gzippo"."0.2.0"; + by-spec."handlebars"."1.0.x" = + self.by-version."handlebars"."1.0.12"; + by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage { name = "handlebars-1.0.12"; src = [ (fetchurl { @@ -5353,34 +4684,20 @@ }) ]; buildInputs = - (self.nativeDeps."handlebars"."1.0.x" or []); + (self.nativeDeps."handlebars" or []); deps = [ - self.full."optimist"."~0.3" - self.full."uglify-js"."~2.3" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-js"."2.3.6" ]; peerDependencies = [ ]; passthru.names = [ "handlebars" ]; }; - full."handlebars"."~1.0.11" = lib.makeOverridable self.buildNodePackage { - name = "handlebars-1.0.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.12.tgz"; - sha1 = "18c6d3440c35e91b19b3ff582b9151ab4985d4fc"; - }) - ]; - buildInputs = - (self.nativeDeps."handlebars"."~1.0.11" or []); - deps = [ - self.full."optimist"."~0.3" - self.full."uglify-js"."~2.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "handlebars" ]; - }; - full."has-color"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + 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.1"; + by-version."has-color"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "has-color-0.1.1"; src = [ (fetchurl { @@ -5389,14 +4706,16 @@ }) ]; buildInputs = - (self.nativeDeps."has-color"."~0.1.0" or []); + (self.nativeDeps."has-color" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "has-color" ]; }; - full."hasher"."~1.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."hasher"."~1.1.4" = + self.by-version."hasher"."1.1.4"; + by-version."hasher"."1.1.4" = lib.makeOverridable self.buildNodePackage { name = "hasher-1.1.4"; src = [ (fetchurl { @@ -5405,15 +4724,17 @@ }) ]; buildInputs = - (self.nativeDeps."hasher"."~1.1.4" or []); + (self.nativeDeps."hasher" or []); deps = [ - self.full."signals".">0.7 <2.0" + self.by-version."signals"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "hasher" ]; }; - full."hat"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."hat"."*" = + self.by-version."hat"."0.0.3"; + by-version."hat"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "hat-0.0.3"; src = [ (fetchurl { @@ -5422,14 +4743,16 @@ }) ]; buildInputs = - (self.nativeDeps."hat"."*" or []); + (self.nativeDeps."hat" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hat" ]; }; - full."hawk"."~0.10.0" = lib.makeOverridable self.buildNodePackage { + by-spec."hawk"."~0.10.0" = + self.by-version."hawk"."0.10.2"; + by-version."hawk"."0.10.2" = lib.makeOverridable self.buildNodePackage { name = "hawk-0.10.2"; src = [ (fetchurl { @@ -5438,38 +4761,22 @@ }) ]; buildInputs = - (self.nativeDeps."hawk"."~0.10.0" or []); + (self.nativeDeps."hawk" or []); deps = [ - self.full."hoek"."0.7.x" - self.full."boom"."0.3.x" - self.full."cryptiles"."0.1.x" - self.full."sntp"."0.1.x" + self.by-version."hoek"."0.7.6" + self.by-version."boom"."0.3.8" + self.by-version."cryptiles"."0.1.3" + self.by-version."sntp"."0.1.4" ]; peerDependencies = [ ]; passthru.names = [ "hawk" ]; }; - full."hawk"."~0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "hawk-0.10.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; - sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk"."~0.10.2" or []); - deps = [ - self.full."hoek"."0.7.x" - self.full."boom"."0.3.x" - self.full."cryptiles"."0.1.x" - self.full."sntp"."0.1.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; - }; - full."hawk"."~0.13.0" = lib.makeOverridable self.buildNodePackage { + by-spec."hawk"."~0.10.2" = + self.by-version."hawk"."0.10.2"; + by-spec."hawk"."~0.13.0" = + self.by-version."hawk"."0.13.1"; + by-version."hawk"."0.13.1" = lib.makeOverridable self.buildNodePackage { name = "hawk-0.13.1"; src = [ (fetchurl { @@ -5478,18 +4785,20 @@ }) ]; buildInputs = - (self.nativeDeps."hawk"."~0.13.0" or []); + (self.nativeDeps."hawk" or []); deps = [ - self.full."hoek"."0.8.x" - self.full."boom"."0.4.x" - self.full."cryptiles"."0.2.x" - self.full."sntp"."0.2.x" + self.by-version."hoek"."0.8.5" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" ]; peerDependencies = [ ]; passthru.names = [ "hawk" ]; }; - full."hawk"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "hawk-1.0.0"; src = [ (fetchurl { @@ -5498,18 +4807,20 @@ }) ]; buildInputs = - (self.nativeDeps."hawk"."~1.0.0" or []); + (self.nativeDeps."hawk" or []); deps = [ - self.full."hoek"."0.9.x" - self.full."boom"."0.4.x" - self.full."cryptiles"."0.2.x" - self.full."sntp"."0.2.x" + self.by-version."hoek"."0.9.1" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" ]; peerDependencies = [ ]; passthru.names = [ "hawk" ]; }; - full."hiredis"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."hiredis"."*" = + self.by-version."hiredis"."0.1.15"; + by-version."hiredis"."0.1.15" = lib.makeOverridable self.buildNodePackage { name = "hiredis-0.1.15"; src = [ (fetchurl { @@ -5518,15 +4829,17 @@ }) ]; buildInputs = - (self.nativeDeps."hiredis"."*" or []); + (self.nativeDeps."hiredis" or []); deps = [ - self.full."bindings"."*" + self.by-version."bindings"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "hiredis" ]; }; - full."hoek"."0.7.x" = lib.makeOverridable self.buildNodePackage { + by-spec."hoek"."0.7.x" = + self.by-version."hoek"."0.7.6"; + by-version."hoek"."0.7.6" = lib.makeOverridable self.buildNodePackage { name = "hoek-0.7.6"; src = [ (fetchurl { @@ -5535,14 +4848,16 @@ }) ]; buildInputs = - (self.nativeDeps."hoek"."0.7.x" or []); + (self.nativeDeps."hoek" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; - full."hoek"."0.8.x" = lib.makeOverridable self.buildNodePackage { + by-spec."hoek"."0.8.x" = + self.by-version."hoek"."0.8.5"; + by-version."hoek"."0.8.5" = lib.makeOverridable self.buildNodePackage { name = "hoek-0.8.5"; src = [ (fetchurl { @@ -5551,14 +4866,16 @@ }) ]; buildInputs = - (self.nativeDeps."hoek"."0.8.x" or []); + (self.nativeDeps."hoek" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; - full."hoek"."0.9.x" = lib.makeOverridable self.buildNodePackage { + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { name = "hoek-0.9.1"; src = [ (fetchurl { @@ -5567,14 +4884,16 @@ }) ]; buildInputs = - (self.nativeDeps."hoek"."0.9.x" or []); + (self.nativeDeps."hoek" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; - full."hooker"."~0.2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."hooker"."~0.2.3" = + self.by-version."hooker"."0.2.3"; + by-version."hooker"."0.2.3" = lib.makeOverridable self.buildNodePackage { name = "hooker-0.2.3"; src = [ (fetchurl { @@ -5583,14 +4902,16 @@ }) ]; buildInputs = - (self.nativeDeps."hooker"."~0.2.3" or []); + (self.nativeDeps."hooker" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hooker" ]; }; - full."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."hooks"."0.2.1" = + self.by-version."hooks"."0.2.1"; + by-version."hooks"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "hooks-0.2.1"; src = [ (fetchurl { @@ -5599,14 +4920,16 @@ }) ]; buildInputs = - (self.nativeDeps."hooks"."0.2.1" or []); + (self.nativeDeps."hooks" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "hooks" ]; }; - full."htdigest"."1.0.7" = lib.makeOverridable self.buildNodePackage { + by-spec."htdigest"."1.0.7" = + self.by-version."htdigest"."1.0.7"; + by-version."htdigest"."1.0.7" = lib.makeOverridable self.buildNodePackage { name = "htdigest-1.0.7"; src = [ (fetchurl { @@ -5615,15 +4938,17 @@ }) ]; buildInputs = - (self.nativeDeps."htdigest"."1.0.7" or []); + (self.nativeDeps."htdigest" or []); deps = [ - self.full."commander"."0.5.1" + self.by-version."commander"."0.5.1" ]; peerDependencies = [ ]; passthru.names = [ "htdigest" ]; }; - full."htmlparser2"."2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."htmlparser2"."2.x" = + self.by-version."htmlparser2"."2.6.0"; + by-version."htmlparser2"."2.6.0" = lib.makeOverridable self.buildNodePackage { name = "htmlparser2-2.6.0"; src = [ (fetchurl { @@ -5632,17 +4957,19 @@ }) ]; buildInputs = - (self.nativeDeps."htmlparser2"."2.x" or []); + (self.nativeDeps."htmlparser2" or []); deps = [ - self.full."domhandler"."2.0" - self.full."domutils"."1.0" - self.full."domelementtype"."1" + self.by-version."domhandler"."2.0.3" + self.by-version."domutils"."1.0.1" + self.by-version."domelementtype"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "htmlparser2" ]; }; - full."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."htmlparser2"."3.1.4" = + self.by-version."htmlparser2"."3.1.4"; + by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage { name = "htmlparser2-3.1.4"; src = [ (fetchurl { @@ -5651,18 +4978,20 @@ }) ]; buildInputs = - (self.nativeDeps."htmlparser2"."3.1.4" or []); + (self.nativeDeps."htmlparser2" or []); deps = [ - self.full."domhandler"."2.0" - self.full."domutils"."1.1" - self.full."domelementtype"."1" - self.full."readable-stream"."1.0" + self.by-version."domhandler"."2.0.3" + self.by-version."domutils"."1.1.6" + self.by-version."domelementtype"."1.1.1" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "htmlparser2" ]; }; - full."htpasswd"."1.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."htpasswd"."1.1.0" = + self.by-version."htpasswd"."1.1.0"; + by-version."htpasswd"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "htpasswd-1.1.0"; src = [ (fetchurl { @@ -5671,15 +5000,17 @@ }) ]; buildInputs = - (self.nativeDeps."htpasswd"."1.1.0" or []); + (self.nativeDeps."htpasswd" or []); deps = [ - self.full."commander"."0.5.1" + self.by-version."commander"."0.5.1" ]; peerDependencies = [ ]; passthru.names = [ "htpasswd" ]; }; - full."http-auth"."1.2.7" = lib.makeOverridable self.buildNodePackage { + by-spec."http-auth"."1.2.7" = + self.by-version."http-auth"."1.2.7"; + by-version."http-auth"."1.2.7" = lib.makeOverridable self.buildNodePackage { name = "http-auth-1.2.7"; src = [ (fetchurl { @@ -5688,17 +5019,19 @@ }) ]; buildInputs = - (self.nativeDeps."http-auth"."1.2.7" or []); + (self.nativeDeps."http-auth" or []); deps = [ - self.full."node-uuid"."1.2.0" - self.full."htpasswd"."1.1.0" - self.full."htdigest"."1.0.7" + self.by-version."node-uuid"."1.2.0" + self.by-version."htpasswd"."1.1.0" + self.by-version."htdigest"."1.0.7" ]; peerDependencies = [ ]; passthru.names = [ "http-auth" ]; }; - full."http-proxy"."~0.10" = lib.makeOverridable self.buildNodePackage { + by-spec."http-proxy"."~0.10" = + self.by-version."http-proxy"."0.10.3"; + by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { name = "http-proxy-0.10.3"; src = [ (fetchurl { @@ -5707,18 +5040,20 @@ }) ]; buildInputs = - (self.nativeDeps."http-proxy"."~0.10" or []); + (self.nativeDeps."http-proxy" or []); deps = [ - self.full."colors"."0.x.x" - self.full."optimist"."0.3.x" - self.full."pkginfo"."0.2.x" - self.full."utile"."~0.1.7" + self.by-version."colors"."0.6.2" + self.by-version."optimist"."0.3.7" + self.by-version."pkginfo"."0.2.3" + self.by-version."utile"."0.1.7" ]; peerDependencies = [ ]; passthru.names = [ "http-proxy" ]; }; - full."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage { + by-spec."http-signature"."0.9.11" = + self.by-version."http-signature"."0.9.11"; + by-version."http-signature"."0.9.11" = lib.makeOverridable self.buildNodePackage { name = "http-signature-0.9.11"; src = [ (fetchurl { @@ -5727,17 +5062,19 @@ }) ]; buildInputs = - (self.nativeDeps."http-signature"."0.9.11" or []); + (self.nativeDeps."http-signature" or []); deps = [ - self.full."assert-plus"."0.1.2" - self.full."asn1"."0.1.11" - self.full."ctype"."0.5.2" + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" ]; peerDependencies = [ ]; passthru.names = [ "http-signature" ]; }; - full."http-signature"."~0.10.0" = lib.makeOverridable self.buildNodePackage { + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { name = "http-signature-0.10.0"; src = [ (fetchurl { @@ -5746,36 +5083,21 @@ }) ]; buildInputs = - (self.nativeDeps."http-signature"."~0.10.0" or []); + (self.nativeDeps."http-signature" or []); deps = [ - self.full."assert-plus"."0.1.2" - self.full."asn1"."0.1.11" - self.full."ctype"."0.5.2" + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" ]; peerDependencies = [ ]; passthru.names = [ "http-signature" ]; }; - full."http-signature"."~0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.9.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; - sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature"."~0.9.11" or []); - deps = [ - self.full."assert-plus"."0.1.2" - self.full."asn1"."0.1.11" - self.full."ctype"."0.5.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; - }; - full."i"."0.3.x" = lib.makeOverridable self.buildNodePackage { + by-spec."http-signature"."~0.9.11" = + self.by-version."http-signature"."0.9.11"; + by-spec."i"."0.3.x" = + self.by-version."i"."0.3.2"; + by-version."i"."0.3.2" = lib.makeOverridable self.buildNodePackage { name = "i-0.3.2"; src = [ (fetchurl { @@ -5784,14 +5106,16 @@ }) ]; buildInputs = - (self.nativeDeps."i"."0.3.x" or []); + (self.nativeDeps."i" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "i" ]; }; - full."i18next"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."i18next"."*" = + self.by-version."i18next"."1.7.1"; + by-version."i18next"."1.7.1" = lib.makeOverridable self.buildNodePackage { name = "i18next-1.7.1"; src = [ (fetchurl { @@ -5800,16 +5124,18 @@ }) ]; buildInputs = - (self.nativeDeps."i18next"."*" or []); + (self.nativeDeps."i18next" or []); deps = [ - self.full."cookies".">= 0.2.2" + self.by-version."cookies"."0.3.6" ]; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.full."i18next"."*"; - full."iconv-lite"."~0.2.10" = lib.makeOverridable self.buildNodePackage { + "i18next" = self.by-version."i18next"."1.7.1"; + by-spec."iconv-lite"."~0.2.10" = + self.by-version."iconv-lite"."0.2.11"; + by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage { name = "iconv-lite-0.2.11"; src = [ (fetchurl { @@ -5818,46 +5144,20 @@ }) ]; buildInputs = - (self.nativeDeps."iconv-lite"."~0.2.10" or []); + (self.nativeDeps."iconv-lite" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "iconv-lite" ]; }; - full."iconv-lite"."~0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "iconv-lite-0.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; - sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; - }) - ]; - buildInputs = - (self.nativeDeps."iconv-lite"."~0.2.11" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iconv-lite" ]; - }; - full."iconv-lite"."~0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "iconv-lite-0.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"; - sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8"; - }) - ]; - buildInputs = - (self.nativeDeps."iconv-lite"."~0.2.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iconv-lite" ]; - }; - full."inherits"."1" = lib.makeOverridable self.buildNodePackage { + by-spec."iconv-lite"."~0.2.11" = + self.by-version."iconv-lite"."0.2.11"; + by-spec."iconv-lite"."~0.2.5" = + self.by-version."iconv-lite"."0.2.11"; + by-spec."inherits"."1" = + self.by-version."inherits"."1.0.0"; + by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "inherits-1.0.0"; src = [ (fetchurl { @@ -5866,30 +5166,18 @@ }) ]; buildInputs = - (self.nativeDeps."inherits"."1" or []); + (self.nativeDeps."inherits" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "inherits" ]; }; - full."inherits"."1.x" = lib.makeOverridable self.buildNodePackage { - name = "inherits-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; - sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits"."1.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - full."inherits"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."inherits"."1.x" = + self.by-version."inherits"."1.0.0"; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "inherits-2.0.1"; src = [ (fetchurl { @@ -5898,46 +5186,20 @@ }) ]; buildInputs = - (self.nativeDeps."inherits"."2" or []); + (self.nativeDeps."inherits" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "inherits" ]; }; - full."inherits"."~1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "inherits-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; - sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits"."~1.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - full."inherits"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "inherits-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits"."~2.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - full."ini"."1" = lib.makeOverridable self.buildNodePackage { + by-spec."inherits"."~1.0.0" = + self.by-version."inherits"."1.0.0"; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; + by-spec."ini"."1" = + self.by-version."ini"."1.1.0"; + by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "ini-1.1.0"; src = [ (fetchurl { @@ -5946,66 +5208,20 @@ }) ]; buildInputs = - (self.nativeDeps."ini"."1" or []); + (self.nativeDeps."ini" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ini" ]; }; - full."ini"."1.x.x" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; - }) - ]; - buildInputs = - (self.nativeDeps."ini"."1.x.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ini" ]; - }; - full."ini"."~1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; - }) - ]; - buildInputs = - (self.nativeDeps."ini"."~1.1.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ini" ]; - }; - full."init-package-json"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; - sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; - }) - ]; - buildInputs = - (self.nativeDeps."init-package-json"."0.0.10" or []); - deps = [ - self.full."promzard"."~0.2.0" - self.full."read"."~1.0.1" - self.full."read-package-json"."1" - self.full."semver"."2.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "init-package-json" ]; - }; - full."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage { + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.1.0"; + by-spec."ini"."~1.1.0" = + self.by-version."ini"."1.1.0"; + by-spec."init-package-json"."0.0.11" = + self.by-version."init-package-json"."0.0.11"; + by-version."init-package-json"."0.0.11" = lib.makeOverridable self.buildNodePackage { name = "init-package-json-0.0.11"; src = [ (fetchurl { @@ -6014,18 +5230,20 @@ }) ]; buildInputs = - (self.nativeDeps."init-package-json"."0.0.11" or []); + (self.nativeDeps."init-package-json" or []); deps = [ - self.full."promzard"."~0.2.0" - self.full."read"."~1.0.1" - self.full."read-package-json"."1" - self.full."semver"."2.x" + self.by-version."promzard"."0.2.0" + self.by-version."read"."1.0.5" + self.by-version."read-package-json"."1.1.4" + self.by-version."semver"."2.2.1" ]; peerDependencies = [ ]; passthru.names = [ "init-package-json" ]; }; - full."inquirer"."~0.2.4" = lib.makeOverridable self.buildNodePackage { + by-spec."inquirer"."~0.2.4" = + self.by-version."inquirer"."0.2.5"; + by-version."inquirer"."0.2.5" = lib.makeOverridable self.buildNodePackage { name = "inquirer-0.2.5"; src = [ (fetchurl { @@ -6034,58 +5252,44 @@ }) ]; buildInputs = - (self.nativeDeps."inquirer"."~0.2.4" or []); + (self.nativeDeps."inquirer" or []); deps = [ - self.full."lodash"."~1.2.1" - self.full."async"."~0.2.8" - self.full."cli-color"."~0.2.2" - self.full."mute-stream"."0.0.3" + self.by-version."lodash"."1.2.1" + self.by-version."async"."0.2.9" + self.by-version."cli-color"."0.2.3" + self.by-version."mute-stream"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "inquirer" ]; }; - full."inquirer"."~0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.4"; + by-spec."inquirer"."~0.3.0" = + self.by-version."inquirer"."0.3.5"; + by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "inquirer-0.3.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.4.tgz"; - sha1 = "af4673b3e1cb746b74d5dafe14ef55c3c1bf7222"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.5.tgz"; + sha1 = "a78be064ac9abf168147c02169a931d9a483a9f6"; }) ]; buildInputs = - (self.nativeDeps."inquirer"."~0.3.0" or []); + (self.nativeDeps."inquirer" or []); deps = [ - self.full."lodash"."~1.2.1" - self.full."async"."~0.2.8" - self.full."cli-color"."~0.2.2" - self.full."mute-stream"."0.0.3" + self.by-version."lodash"."1.2.1" + self.by-version."async"."0.2.9" + self.by-version."cli-color"."0.2.3" + self.by-version."mute-stream"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "inquirer" ]; }; - full."inquirer"."~0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.4.tgz"; - sha1 = "af4673b3e1cb746b74d5dafe14ef55c3c1bf7222"; - }) - ]; - buildInputs = - (self.nativeDeps."inquirer"."~0.3.1" or []); - deps = [ - self.full."lodash"."~1.2.1" - self.full."async"."~0.2.8" - self.full."cli-color"."~0.2.2" - self.full."mute-stream"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "inquirer" ]; - }; - full."insight"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."inquirer"."~0.3.1" = + self.by-version."inquirer"."0.3.5"; + by-spec."insight"."~0.2.0" = + self.by-version."insight"."0.2.0"; + by-version."insight"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "insight-0.2.0"; src = [ (fetchurl { @@ -6094,20 +5298,22 @@ }) ]; buildInputs = - (self.nativeDeps."insight"."~0.2.0" or []); + (self.nativeDeps."insight" or []); deps = [ - self.full."chalk"."~0.2.0" - self.full."request"."~2.27.0" - self.full."configstore"."~0.1.0" - self.full."async"."~0.2.9" - self.full."lodash"."~1.3.1" - self.full."inquirer"."~0.2.4" + self.by-version."chalk"."0.2.1" + self.by-version."request"."2.27.0" + self.by-version."configstore"."0.1.5" + self.by-version."async"."0.2.9" + self.by-version."lodash"."1.3.1" + self.by-version."inquirer"."0.2.5" ]; peerDependencies = [ ]; passthru.names = [ "insight" ]; }; - full."intersect"."~0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."intersect"."~0.0.3" = + self.by-version."intersect"."0.0.3"; + by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "intersect-0.0.3"; src = [ (fetchurl { @@ -6116,14 +5322,16 @@ }) ]; buildInputs = - (self.nativeDeps."intersect"."~0.0.3" or []); + (self.nativeDeps."intersect" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "intersect" ]; }; - full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."ironhorse"."*" = + self.by-version."ironhorse"."0.0.9"; + by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage { name = "ironhorse-0.0.9"; src = [ (fetchurl { @@ -6132,31 +5340,33 @@ }) ]; buildInputs = - (self.nativeDeps."ironhorse"."*" or []); + (self.nativeDeps."ironhorse" or []); deps = [ - self.full."underscore"."~1.5.2" - self.full."winston"."*" - self.full."nconf"."*" - self.full."fs-walk"."*" - self.full."async"."*" - self.full."express"."*" - self.full."jade"."*" - self.full."passport"."*" - self.full."passport-http"."*" - self.full."js-yaml"."*" - self.full."mongoose"."*" - self.full."gridfs-stream"."*" - self.full."temp"."*" - self.full."kue"."*" - self.full."redis"."*" - self.full."hiredis"."*" + self.by-version."underscore"."1.5.2" + self.by-version."winston"."0.7.2" + self.by-version."nconf"."0.6.8" + self.by-version."fs-walk"."0.0.1" + self.by-version."async"."0.2.9" + self.by-version."express"."3.4.4" + self.by-version."jade"."0.35.0" + self.by-version."passport"."0.1.17" + self.by-version."passport-http"."0.2.2" + self.by-version."js-yaml"."2.1.3" + self.by-version."mongoose"."3.8.0" + self.by-version."gridfs-stream"."0.4.0" + self.by-version."temp"."0.6.0" + self.by-version."kue"."0.6.2" + self.by-version."redis"."0.9.0" + self.by-version."hiredis"."0.1.15" ]; peerDependencies = [ ]; passthru.names = [ "ironhorse" ]; }; - "ironhorse" = self.full."ironhorse"."*"; - full."is-promise"."~1" = lib.makeOverridable self.buildNodePackage { + "ironhorse" = self.by-version."ironhorse"."0.0.9"; + by-spec."is-promise"."~1" = + self.by-version."is-promise"."1.0.0"; + by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "is-promise-1.0.0"; src = [ (fetchurl { @@ -6165,14 +5375,16 @@ }) ]; buildInputs = - (self.nativeDeps."is-promise"."~1" or []); + (self.nativeDeps."is-promise" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "is-promise" ]; }; - full."isbinaryfile"."~0.1.8" = lib.makeOverridable self.buildNodePackage { + by-spec."isbinaryfile"."~0.1.8" = + self.by-version."isbinaryfile"."0.1.9"; + by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage { name = "isbinaryfile-0.1.9"; src = [ (fetchurl { @@ -6181,14 +5393,16 @@ }) ]; buildInputs = - (self.nativeDeps."isbinaryfile"."~0.1.8" or []); + (self.nativeDeps."isbinaryfile" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "isbinaryfile" ]; }; - full."istanbul"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."istanbul"."*" = + self.by-version."istanbul"."0.1.44"; + by-version."istanbul"."0.1.44" = lib.makeOverridable self.buildNodePackage { name = "istanbul-0.1.44"; src = [ (fetchurl { @@ -6197,53 +5411,30 @@ }) ]; buildInputs = - (self.nativeDeps."istanbul"."*" or []); + (self.nativeDeps."istanbul" or []); deps = [ - self.full."esprima"."1.0.x" - self.full."escodegen"."0.0.23" - self.full."handlebars"."1.0.x" - self.full."mkdirp"."0.3.x" - self.full."nopt"."2.1.x" - self.full."fileset"."0.1.x" - self.full."which"."1.0.x" - self.full."async"."0.2.x" - self.full."abbrev"."1.0.x" - self.full."wordwrap"."0.0.x" - self.full."resolve"."0.5.x" + 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.9" + 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.full."istanbul"."*"; - full."istanbul"."~0.1.41" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.1.44"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.44.tgz"; - sha1 = "7ea1d55e34234e7b7d8f2f61cceb29b59439d983"; - }) - ]; - buildInputs = - (self.nativeDeps."istanbul"."~0.1.41" or []); - deps = [ - self.full."esprima"."1.0.x" - self.full."escodegen"."0.0.23" - self.full."handlebars"."1.0.x" - self.full."mkdirp"."0.3.x" - self.full."nopt"."2.1.x" - self.full."fileset"."0.1.x" - self.full."which"."1.0.x" - self.full."async"."0.2.x" - self.full."abbrev"."1.0.x" - self.full."wordwrap"."0.0.x" - self.full."resolve"."0.5.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "istanbul" ]; - }; - full."jade"."*" = lib.makeOverridable self.buildNodePackage { + "istanbul" = self.by-version."istanbul"."0.1.44"; + by-spec."istanbul"."~0.1.41" = + self.by-version."istanbul"."0.1.44"; + by-spec."jade"."*" = + self.by-version."jade"."0.35.0"; + by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { name = "jade-0.35.0"; src = [ (fetchurl { @@ -6252,22 +5443,24 @@ }) ]; buildInputs = - (self.nativeDeps."jade"."*" or []); + (self.nativeDeps."jade" or []); deps = [ - self.full."commander"."2.0.0" - self.full."mkdirp"."0.3.x" - self.full."transformers"."2.1.0" - self.full."character-parser"."1.2.0" - self.full."monocle"."1.1.50" - self.full."with"."~1.1.0" - self.full."constantinople"."~1.0.1" + self.by-version."commander"."2.0.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."transformers"."2.1.0" + self.by-version."character-parser"."1.2.0" + self.by-version."monocle"."1.1.50" + self.by-version."with"."1.1.1" + self.by-version."constantinople"."1.0.2" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - "jade" = self.full."jade"."*"; - full."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { + "jade" = self.by-version."jade"."0.35.0"; + by-spec."jade"."0.26.3" = + self.by-version."jade"."0.26.3"; + by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { name = "jade-0.26.3"; src = [ (fetchurl { @@ -6276,16 +5469,18 @@ }) ]; buildInputs = - (self.nativeDeps."jade"."0.26.3" or []); + (self.nativeDeps."jade" or []); deps = [ - self.full."commander"."0.6.1" - self.full."mkdirp"."0.3.0" + self.by-version."commander"."0.6.1" + self.by-version."mkdirp"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - full."jade"."0.27.0" = lib.makeOverridable self.buildNodePackage { + by-spec."jade"."0.27.0" = + self.by-version."jade"."0.27.0"; + by-version."jade"."0.27.0" = lib.makeOverridable self.buildNodePackage { name = "jade-0.27.0"; src = [ (fetchurl { @@ -6294,39 +5489,20 @@ }) ]; buildInputs = - (self.nativeDeps."jade"."0.27.0" or []); + (self.nativeDeps."jade" or []); deps = [ - self.full."commander"."0.6.1" - self.full."mkdirp"."0.3.0" + self.by-version."commander"."0.6.1" + self.by-version."mkdirp"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "jade" ]; }; - full."jade".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-0.35.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz"; - sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9"; - }) - ]; - buildInputs = - (self.nativeDeps."jade".">= 0.0.1" or []); - deps = [ - self.full."commander"."2.0.0" - self.full."mkdirp"."0.3.x" - self.full."transformers"."2.1.0" - self.full."character-parser"."1.2.0" - self.full."monocle"."1.1.50" - self.full."with"."~1.1.0" - self.full."constantinople"."~1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "jade" ]; - }; - full."jayschema"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."jade".">= 0.0.1" = + self.by-version."jade"."0.35.0"; + by-spec."jayschema"."*" = + self.by-version."jayschema"."0.2.0"; + by-version."jayschema"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "jayschema-0.2.0"; src = [ (fetchurl { @@ -6335,85 +5511,18 @@ }) ]; buildInputs = - (self.nativeDeps."jayschema"."*" or []); + (self.nativeDeps."jayschema" or []); deps = [ - self.full."when"."~2.2.1" + self.by-version."when"."2.2.1" ]; peerDependencies = [ ]; passthru.names = [ "jayschema" ]; }; - "jayschema" = self.full."jayschema"."*"; - full."joe"."1.x" = lib.makeOverridable self.buildNodePackage { - name = "joe-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz"; - sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa"; - }) - ]; - buildInputs = - (self.nativeDeps."joe"."1.x" or []); - deps = [ - self.full."taskgroup"."~3.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "joe" ]; - }; - full."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0" = lib.makeOverridable self.buildNodePackage { - name = "joe-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz"; - sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa"; - }) - ]; - buildInputs = - (self.nativeDeps."joe".">=1.0.0-0 >=1.3.0-0 <1.4.0-0" or []); - deps = [ - self.full."taskgroup"."~3.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "joe" ]; - }; - full."joe"."~1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "joe-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/joe/-/joe-1.3.0.tgz"; - sha1 = "dbde3133917f5f1683b67ba9dd5ca4d561306efa"; - }) - ]; - buildInputs = - (self.nativeDeps."joe"."~1.3.0" or []); - deps = [ - self.full."taskgroup"."~3.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "joe" ]; - }; - full."joe-reporter-console"."~1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "joe-reporter-console-1.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/joe-reporter-console/-/joe-reporter-console-1.2.1.tgz"; - sha1 = "6887fa067121b0e67b571672aa63b358055eddc1"; - }) - ]; - buildInputs = - (self.nativeDeps."joe-reporter-console"."~1.2.1" or []); - deps = [ - self.full."cli-color"."~0.2.2" - ]; - peerDependencies = [ - self.full."joe"."1.x" - ]; - passthru.names = [ "joe-reporter-console" ]; - }; - full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage { + "jayschema" = self.by-version."jayschema"."0.2.0"; + by-spec."js-yaml"."*" = + 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 { @@ -6422,17 +5531,19 @@ }) ]; buildInputs = - (self.nativeDeps."js-yaml"."*" or []); + (self.nativeDeps."js-yaml" or []); deps = [ - self.full."argparse"."~ 0.1.11" - self.full."esprima"."~ 1.0.2" + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.full."js-yaml"."*"; - full."js-yaml"."0.3.x" = lib.makeOverridable self.buildNodePackage { + "js-yaml" = self.by-version."js-yaml"."2.1.3"; + by-spec."js-yaml"."0.3.x" = + self.by-version."js-yaml"."0.3.7"; + by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-0.3.7"; src = [ (fetchurl { @@ -6441,14 +5552,16 @@ }) ]; buildInputs = - (self.nativeDeps."js-yaml"."0.3.x" or []); + (self.nativeDeps."js-yaml" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - full."js-yaml"."2.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."js-yaml"."2.1.0" = + self.by-version."js-yaml"."2.1.0"; + by-version."js-yaml"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-2.1.0"; src = [ (fetchurl { @@ -6457,16 +5570,18 @@ }) ]; buildInputs = - (self.nativeDeps."js-yaml"."2.1.0" or []); + (self.nativeDeps."js-yaml" or []); deps = [ - self.full."argparse"."~ 0.1.11" - self.full."esprima"."~ 1.0.2" + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - full."js-yaml"."~2.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."js-yaml"."~2.0.2" = + self.by-version."js-yaml"."2.0.5"; + by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-2.0.5"; src = [ (fetchurl { @@ -6475,77 +5590,64 @@ }) ]; buildInputs = - (self.nativeDeps."js-yaml"."~2.0.2" or []); + (self.nativeDeps."js-yaml" or []); deps = [ - self.full."argparse"."~ 0.1.11" - self.full."esprima"."~ 1.0.2" + self.by-version."argparse"."0.1.15" + self.by-version."esprima"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - full."js-yaml"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-2.1.3"; + by-spec."js-yaml"."~2.1.0" = + self.by-version."js-yaml"."2.1.3"; + by-spec."jsesc"."0.4.3" = + self.by-version."jsesc"."0.4.3"; + by-version."jsesc"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "jsesc-0.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.3.tgz"; - sha1 = "0ffb5617be55525878063d7a16aee7fdd282e84c"; + url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz"; + sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9"; }) ]; buildInputs = - (self.nativeDeps."js-yaml"."~2.1.0" or []); + (self.nativeDeps."jsesc" or []); deps = [ - self.full."argparse"."~ 0.1.11" - self.full."esprima"."~ 1.0.2" ]; peerDependencies = [ ]; - passthru.names = [ "js-yaml" ]; + passthru.names = [ "jsesc" ]; }; - full."jshint"."*" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.2.0"; + by-spec."jshint"."*" = + self.by-version."jshint"."2.3.0"; + by-version."jshint"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.2.0.tgz"; - sha1 = "9cd120e17c6635a5bfd6339531b088ed33eb5af2"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.3.0.tgz"; + sha1 = "19504455a2c20c46ee183361eb87f3a1c0b7dc47"; }) ]; buildInputs = - (self.nativeDeps."jshint"."*" or []); + (self.nativeDeps."jshint" or []); deps = [ - self.full."shelljs"."0.1.x" - self.full."underscore"."1.4.x" - self.full."cli"."0.4.x" - self.full."minimatch"."0.x.x" - self.full."console-browserify"."0.1.x" + self.by-version."shelljs"."0.1.4" + self.by-version."underscore"."1.4.4" + self.by-version."cli"."0.4.5" + self.by-version."minimatch"."0.2.12" + self.by-version."console-browserify"."0.1.6" ]; peerDependencies = [ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.full."jshint"."*"; - full."jshint"."~2.1.10" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.1.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.1.11.tgz"; - sha1 = "eb5108fef9ba5ddebb830983f572d242e49e3f96"; - }) - ]; - buildInputs = - (self.nativeDeps."jshint"."~2.1.10" or []); - deps = [ - self.full."shelljs"."0.1.x" - self.full."underscore"."1.4.x" - self.full."cli"."0.4.x" - self.full."minimatch"."0.x.x" - self.full."console-browserify"."0.1.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "jshint" ]; - }; - full."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { + "jshint" = self.by-version."jshint"."2.3.0"; + by-spec."jshint"."~2.3.0" = + self.by-version."jshint"."2.3.0"; + by-spec."json-schema"."0.2.2" = + self.by-version."json-schema"."0.2.2"; + by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "json-schema-0.2.2"; src = [ (fetchurl { @@ -6554,14 +5656,16 @@ }) ]; buildInputs = - (self.nativeDeps."json-schema"."0.2.2" or []); + (self.nativeDeps."json-schema" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "json-schema" ]; }; - full."json-stringify-safe"."~3.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."json-stringify-safe"."~3.0.0" = + self.by-version."json-stringify-safe"."3.0.0"; + by-version."json-stringify-safe"."3.0.0" = lib.makeOverridable self.buildNodePackage { name = "json-stringify-safe-3.0.0"; src = [ (fetchurl { @@ -6570,14 +5674,16 @@ }) ]; buildInputs = - (self.nativeDeps."json-stringify-safe"."~3.0.0" or []); + (self.nativeDeps."json-stringify-safe" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; }; - full."json-stringify-safe"."~4.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."json-stringify-safe"."~4.0.0" = + self.by-version."json-stringify-safe"."4.0.0"; + by-version."json-stringify-safe"."4.0.0" = lib.makeOverridable self.buildNodePackage { name = "json-stringify-safe-4.0.0"; src = [ (fetchurl { @@ -6586,14 +5692,16 @@ }) ]; buildInputs = - (self.nativeDeps."json-stringify-safe"."~4.0.0" or []); + (self.nativeDeps."json-stringify-safe" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; }; - full."json-stringify-safe"."~5.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { name = "json-stringify-safe-5.0.0"; src = [ (fetchurl { @@ -6602,14 +5710,16 @@ }) ]; buildInputs = - (self.nativeDeps."json-stringify-safe"."~5.0.0" or []); + (self.nativeDeps."json-stringify-safe" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; }; - full."jsontool"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."jsontool"."*" = + self.by-version."jsontool"."6.0.0"; + by-version."jsontool"."6.0.0" = lib.makeOverridable self.buildNodePackage { name = "jsontool-6.0.0"; src = [ (fetchurl { @@ -6618,15 +5728,17 @@ }) ]; buildInputs = - (self.nativeDeps."jsontool"."*" or []); + (self.nativeDeps."jsontool" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "jsontool" ]; }; - "jsontool" = self.full."jsontool"."*"; - full."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { + "jsontool" = self.by-version."jsontool"."6.0.0"; + by-spec."jsprim"."0.3.0" = + self.by-version."jsprim"."0.3.0"; + by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "jsprim-0.3.0"; src = [ (fetchurl { @@ -6635,17 +5747,19 @@ }) ]; buildInputs = - (self.nativeDeps."jsprim"."0.3.0" or []); + (self.nativeDeps."jsprim" or []); deps = [ - self.full."extsprintf"."1.0.0" - self.full."json-schema"."0.2.2" - self.full."verror"."1.3.3" + self.by-version."extsprintf"."1.0.0" + self.by-version."json-schema"."0.2.2" + self.by-version."verror"."1.3.3" ]; peerDependencies = [ ]; passthru.names = [ "jsprim" ]; }; - full."junk"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."junk"."~0.2.0" = + self.by-version."junk"."0.2.1"; + by-version."junk"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "junk-0.2.1"; src = [ (fetchurl { @@ -6654,337 +5768,181 @@ }) ]; buildInputs = - (self.nativeDeps."junk"."~0.2.0" or []); + (self.nativeDeps."junk" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "junk" ]; }; - full."karma"."*" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.11.0"; + by-spec."karma"."*" = + self.by-version."karma"."0.11.2"; + "karma" = self.by-version."karma"."0.11.2"; + by-spec."karma".">=0.9" = + self.by-version."karma"."0.11.2"; + by-spec."karma".">=0.9.3" = + self.by-version."karma"."0.11.2"; + by-spec."karma"."~0.10.0" = + self.by-version."karma"."0.10.4"; + by-version."karma"."0.10.4" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.10.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz"; - sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; - sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; - sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; - sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; - sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; - sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.4.tgz"; + sha1 = "b53eda54b8a5f61296a8bd9bb95801652e75b659"; }) ]; buildInputs = - (self.nativeDeps."karma"."*" or []) - ++ (self.nativeDeps."karma-jasmine"."*" or []) - ++ (self.nativeDeps."karma-requirejs"."*" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-chrome-launcher"."*" or []) - ++ (self.nativeDeps."karma-firefox-launcher"."*" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or []) - ++ (self.nativeDeps."karma-script-launcher"."*" or []); + (self.nativeDeps."karma" or []); deps = [ - self.full."di"."~0.0.1" - self.full."socket.io"."~0.9.13" - self.full."chokidar"."~0.6" - self.full."glob"."~3.1.21" - self.full."minimatch"."~0.2" - self.full."http-proxy"."~0.10" - self.full."optimist"."~0.3" - self.full."coffee-script"."~1.6" - self.full."rimraf"."~2.1" - self.full."q"."~0.9" - self.full."colors"."0.6.0-1" - self.full."lodash"."~1.1" - self.full."mime"."~1.2" - self.full."log4js"."~0.6.3" - self.full."useragent"."~2.0.4" - self.full."graceful-fs"."~1.2.1" - self.full."connect"."~2.8.4" - self.full."phantomjs"."~1.9" + self.by-version."di"."0.0.1" + self.by-version."socket.io"."0.9.16" + self.by-version."chokidar"."0.7.0" + self.by-version."glob"."3.1.21" + self.by-version."minimatch"."0.2.12" + self.by-version."http-proxy"."0.10.3" + self.by-version."optimist"."0.3.7" + self.by-version."coffee-script"."1.6.3" + self.by-version."rimraf"."2.1.4" + self.by-version."q"."0.9.7" + self.by-version."colors"."0.6.0-1" + self.by-version."lodash"."1.1.1" + self.by-version."mime"."1.2.11" + self.by-version."log4js"."0.6.9" + self.by-version."useragent"."2.0.7" + self.by-version."graceful-fs"."1.2.3" + self.by-version."connect"."2.8.8" ]; peerDependencies = [ + self.by-version."karma-jasmine"."0.1.3" + self.by-version."karma-requirejs"."0.1.0" + self.by-version."karma-coffee-preprocessor"."0.1.0" + self.by-version."karma-html2js-preprocessor"."0.1.0" + self.by-version."karma-chrome-launcher"."0.1.0" + self.by-version."karma-firefox-launcher"."0.1.0" + self.by-version."karma-phantomjs-launcher"."0.1.0" + self.by-version."karma-script-launcher"."0.1.0" ]; - passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + passthru.names = [ "karma" ]; }; - "karma" = self.full."karma"."*"; - full."karma".">=0.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.11.0"; + by-spec."karma-chrome-launcher"."*" = + self.by-version."karma-chrome-launcher"."0.1.0"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.0"; + by-spec."karma-coffee-preprocessor"."*" = + self.by-version."karma-coffee-preprocessor"."0.1.0"; + by-spec."karma-coverage"."*" = + self.by-version."karma-coverage"."0.1.1"; + by-version."karma-coverage"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz"; - sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; - sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; - sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; - sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; - sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; - sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.1.tgz"; + sha1 = "e588d65307b8addf7b2b7589d1d1aeafdef318db"; }) ]; buildInputs = - (self.nativeDeps."karma".">=0.9" or []) - ++ (self.nativeDeps."karma-jasmine"."*" or []) - ++ (self.nativeDeps."karma-requirejs"."*" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-chrome-launcher"."*" or []) - ++ (self.nativeDeps."karma-firefox-launcher"."*" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or []) - ++ (self.nativeDeps."karma-script-launcher"."*" or []); + (self.nativeDeps."karma-coverage" or []); deps = [ - self.full."di"."~0.0.1" - self.full."socket.io"."~0.9.13" - self.full."chokidar"."~0.6" - self.full."glob"."~3.1.21" - self.full."minimatch"."~0.2" - self.full."http-proxy"."~0.10" - self.full."optimist"."~0.3" - self.full."coffee-script"."~1.6" - self.full."rimraf"."~2.1" - self.full."q"."~0.9" - self.full."colors"."0.6.0-1" - self.full."lodash"."~1.1" - self.full."mime"."~1.2" - self.full."log4js"."~0.6.3" - self.full."useragent"."~2.0.4" - self.full."graceful-fs"."~1.2.1" - self.full."connect"."~2.8.4" - self.full."phantomjs"."~1.9" + self.by-version."istanbul"."0.1.44" + self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ - ]; - passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; - }; - full."karma".">=0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.11.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.0.tgz"; - sha1 = "554ff769ad9b5f3c78f051ad7e607c529b6c825e"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; - sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; - sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; - sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; - sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; - sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; - }) - ]; - buildInputs = - (self.nativeDeps."karma".">=0.9.3" or []) - ++ (self.nativeDeps."karma-jasmine"."*" or []) - ++ (self.nativeDeps."karma-requirejs"."*" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-chrome-launcher"."*" or []) - ++ (self.nativeDeps."karma-firefox-launcher"."*" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or []) - ++ (self.nativeDeps."karma-script-launcher"."*" or []); - deps = [ - self.full."di"."~0.0.1" - self.full."socket.io"."~0.9.13" - self.full."chokidar"."~0.6" - self.full."glob"."~3.1.21" - self.full."minimatch"."~0.2" - self.full."http-proxy"."~0.10" - self.full."optimist"."~0.3" - self.full."coffee-script"."~1.6" - self.full."rimraf"."~2.1" - self.full."q"."~0.9" - self.full."colors"."0.6.0-1" - self.full."lodash"."~1.1" - self.full."mime"."~1.2" - self.full."log4js"."~0.6.3" - self.full."useragent"."~2.0.4" - self.full."graceful-fs"."~1.2.1" - self.full."connect"."~2.8.4" - self.full."phantomjs"."~1.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; - }; - full."karma"."~0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.2.tgz"; - sha1 = "4e100bd346bb24a1260dcd34b5b3d2d4a9b27b17"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; - sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; - sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; - sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; - sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; - sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; - sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; - sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; - }) - (fetchurl { - url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; - sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; - }) - ]; - buildInputs = - (self.nativeDeps."karma"."~0.10.0" or []) - ++ (self.nativeDeps."karma-jasmine"."*" or []) - ++ (self.nativeDeps."karma-requirejs"."*" or []) - ++ (self.nativeDeps."karma-coffee-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-html2js-preprocessor"."*" or []) - ++ (self.nativeDeps."karma-chrome-launcher"."*" or []) - ++ (self.nativeDeps."karma-firefox-launcher"."*" or []) - ++ (self.nativeDeps."karma-phantomjs-launcher"."*" or []) - ++ (self.nativeDeps."karma-script-launcher"."*" or []); - deps = [ - self.full."di"."~0.0.1" - self.full."socket.io"."~0.9.13" - self.full."chokidar"."~0.6" - self.full."glob"."~3.1.21" - self.full."minimatch"."~0.2" - self.full."http-proxy"."~0.10" - self.full."optimist"."~0.3" - self.full."coffee-script"."~1.6" - self.full."rimraf"."~2.1" - self.full."q"."~0.9" - self.full."colors"."0.6.0-1" - self.full."lodash"."~1.1" - self.full."mime"."~1.2" - self.full."log4js"."~0.6.3" - self.full."useragent"."~2.0.4" - self.full."graceful-fs"."~1.2.1" - self.full."connect"."~2.8.4" - self.full."phantomjs"."~1.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "karma" "karma-jasmine" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; - }; - full."karma-chrome-launcher"."*" = self.full."karma"."~0.10.0"; - "karma-chrome-launcher" = self.full."karma-chrome-launcher"."*"; - full."karma-coffee-preprocessor"."*" = self.full."karma"."~0.10.0"; - full."karma-coverage"."*" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.0.tgz"; - sha1 = "6d5d03352cbe2d529807e558688dceea55f9dbb0"; - }) - ]; - buildInputs = - (self.nativeDeps."karma-coverage"."*" or []); - deps = [ - self.full."istanbul"."~0.1.41" - self.full."dateformat"."~1.0.6" - ]; - peerDependencies = [ - self.full."karma".">=0.9" + self.by-version."karma"."0.11.2" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.full."karma-coverage"."*"; - full."karma-firefox-launcher"."*" = self.full."karma"."~0.10.0"; - full."karma-html2js-preprocessor"."*" = self.full."karma"."~0.10.0"; - full."karma-jasmine"."*" = self.full."karma"."~0.10.0"; - full."karma-junit-reporter"."*" = lib.makeOverridable self.buildNodePackage { + "karma-coverage" = self.by-version."karma-coverage"."0.1.1"; + by-spec."karma-firefox-launcher"."*" = + self.by-version."karma-firefox-launcher"."0.1.0"; + by-spec."karma-html2js-preprocessor"."*" = + self.by-version."karma-html2js-preprocessor"."0.1.0"; + by-spec."karma-jasmine"."*" = + self.by-version."karma-jasmine"."0.1.3"; + by-version."karma"."0.11.2" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-requirejs"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-coffee-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-chrome-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-firefox-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-phantomjs-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "karma-jasmine-0.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/karma-jasmine/-/karma-jasmine-0.1.3.tgz"; + sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma/-/karma-0.11.2.tgz"; + sha1 = "cb9d7ff974f3f0c8834980ebf8e689a88091008e"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.1.0.tgz"; + sha1 = "d9554aa0f11f2c0ff2e933ab5043a633b1305622"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-coffee-preprocessor/-/karma-coffee-preprocessor-0.1.0.tgz"; + sha1 = "713affc9990707e43eb6f64afdaf312072b73aab"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-0.1.0.tgz"; + sha1 = "2f7cf881f54a5d0b72154cc6ee1241c44292c7fe"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.0.tgz"; + sha1 = "d29f42911358a640ba4a13f1d2110819ae2e5cea"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.0.tgz"; + sha1 = "e5517590eea029d10d500b5f82ae423aafe069d4"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.0.tgz"; + sha1 = "9ef8243751524e32e67b97e3f8a321ee68a3fa2f"; + }) + (fetchurl { + url = "http://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-0.1.0.tgz"; + sha1 = "b643e7c2faead1a52cdb2eeaadcf7a245f0d772a"; + }) + ]; + buildInputs = + (self.nativeDeps."karma-jasmine" or []) + ++ (self.nativeDeps."karma" or []) + ++ (self.nativeDeps."karma-requirejs" or []) + ++ (self.nativeDeps."karma-coffee-preprocessor" or []) + ++ (self.nativeDeps."karma-html2js-preprocessor" or []) + ++ (self.nativeDeps."karma-chrome-launcher" or []) + ++ (self.nativeDeps."karma-firefox-launcher" or []) + ++ (self.nativeDeps."karma-phantomjs-launcher" or []) + ++ (self.nativeDeps."karma-script-launcher" or []); + deps = [ + self.by-version."di"."0.0.1" + self.by-version."socket.io"."0.9.16" + self.by-version."chokidar"."0.7.0" + self.by-version."glob"."3.1.21" + self.by-version."minimatch"."0.2.12" + self.by-version."http-proxy"."0.10.3" + self.by-version."optimist"."0.3.7" + self.by-version."coffee-script"."1.6.3" + self.by-version."rimraf"."2.1.4" + self.by-version."q"."0.9.7" + self.by-version."colors"."0.6.0-1" + self.by-version."lodash"."1.1.1" + self.by-version."mime"."1.2.11" + self.by-version."log4js"."0.6.9" + self.by-version."useragent"."2.0.7" + self.by-version."graceful-fs"."1.2.3" + self.by-version."connect"."2.8.8" + self.by-version."phantomjs"."1.9.2-2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "karma-jasmine" "karma" "karma-requirejs" "karma-coffee-preprocessor" "karma-html2js-preprocessor" "karma-chrome-launcher" "karma-firefox-launcher" "karma-phantomjs-launcher" "karma-script-launcher" ]; + }; + by-spec."karma-junit-reporter"."*" = + self.by-version."karma-junit-reporter"."0.1.0"; + by-version."karma-junit-reporter"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "karma-junit-reporter-0.1.0"; src = [ (fetchurl { @@ -6993,17 +5951,19 @@ }) ]; buildInputs = - (self.nativeDeps."karma-junit-reporter"."*" or []); + (self.nativeDeps."karma-junit-reporter" or []); deps = [ - self.full."xmlbuilder"."0.4.2" + self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.full."karma".">=0.9" + self.by-version."karma"."0.11.2" ]; passthru.names = [ "karma-junit-reporter" ]; }; - "karma-junit-reporter" = self.full."karma-junit-reporter"."*"; - full."karma-mocha"."*" = lib.makeOverridable self.buildNodePackage { + "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.1.0"; + by-spec."karma-mocha"."*" = + self.by-version."karma-mocha"."0.1.0"; + by-version."karma-mocha"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "karma-mocha-0.1.0"; src = [ (fetchurl { @@ -7012,20 +5972,24 @@ }) ]; buildInputs = - (self.nativeDeps."karma-mocha"."*" or []); + (self.nativeDeps."karma-mocha" or []); deps = [ ]; peerDependencies = [ - self.full."karma".">=0.9" - self.full."mocha"."*" + self.by-version."karma"."0.11.2" + self.by-version."mocha"."1.14.0" ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.full."karma-mocha"."*"; - full."karma-phantomjs-launcher"."*" = self.full."karma"."~0.10.0"; - full."karma-requirejs"."*" = self.full."karma"."~0.10.0"; - "karma-requirejs" = self.full."karma-requirejs"."*"; - full."karma-sauce-launcher"."*" = lib.makeOverridable self.buildNodePackage { + "karma-mocha" = self.by-version."karma-mocha"."0.1.0"; + by-spec."karma-phantomjs-launcher"."*" = + self.by-version."karma-phantomjs-launcher"."0.1.0"; + by-spec."karma-requirejs"."*" = + self.by-version."karma-requirejs"."0.1.0"; + "karma-requirejs" = self.by-version."karma-requirejs"."0.1.0"; + by-spec."karma-sauce-launcher"."*" = + self.by-version."karma-sauce-launcher"."0.1.1"; + by-version."karma-sauce-launcher"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "karma-sauce-launcher-0.1.1"; src = [ (fetchurl { @@ -7034,20 +5998,23 @@ }) ]; buildInputs = - (self.nativeDeps."karma-sauce-launcher"."*" or []); + (self.nativeDeps."karma-sauce-launcher" or []); deps = [ - self.full."wd"."~0.1.5" - self.full."sauce-connect-launcher"."~0.1.10" - self.full."q"."~0.9.6" + self.by-version."wd"."0.1.5" + self.by-version."sauce-connect-launcher"."0.1.11" + self.by-version."q"."0.9.7" ]; peerDependencies = [ - self.full."karma".">=0.9" + self.by-version."karma"."0.11.2" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.full."karma-sauce-launcher"."*"; - full."karma-script-launcher"."*" = self.full."karma"."~0.10.0"; - full."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage { + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.1"; + by-spec."karma-script-launcher"."*" = + self.by-version."karma-script-launcher"."0.1.0"; + by-spec."keen.io"."0.0.3" = + self.by-version."keen.io"."0.0.3"; + by-version."keen.io"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "keen.io-0.0.3"; src = [ (fetchurl { @@ -7056,16 +6023,18 @@ }) ]; buildInputs = - (self.nativeDeps."keen.io"."0.0.3" or []); + (self.nativeDeps."keen.io" or []); deps = [ - self.full."superagent"."~0.13.0" - self.full."underscore"."~1.4.4" + self.by-version."superagent"."0.13.0" + self.by-version."underscore"."1.4.4" ]; peerDependencies = [ ]; passthru.names = [ "keen.io" ]; }; - full."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."keep-alive-agent"."0.0.1" = + self.by-version."keep-alive-agent"."0.0.1"; + by-version."keep-alive-agent"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "keep-alive-agent-0.0.1"; src = [ (fetchurl { @@ -7074,14 +6043,16 @@ }) ]; buildInputs = - (self.nativeDeps."keep-alive-agent"."0.0.1" or []); + (self.nativeDeps."keep-alive-agent" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "keep-alive-agent" ]; }; - full."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."kerberos"."0.0.3" = + self.by-version."kerberos"."0.0.3"; + by-version."kerberos"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "kerberos-0.0.3"; src = [ (fetchurl { @@ -7090,14 +6061,16 @@ }) ]; buildInputs = - (self.nativeDeps."kerberos"."0.0.3" or []); + (self.nativeDeps."kerberos" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "kerberos" ]; }; - full."kew"."~0.1.7" = lib.makeOverridable self.buildNodePackage { + by-spec."kew"."~0.1.7" = + self.by-version."kew"."0.1.7"; + by-version."kew"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "kew-0.1.7"; src = [ (fetchurl { @@ -7106,14 +6079,34 @@ }) ]; buildInputs = - (self.nativeDeps."kew"."~0.1.7" or []); + (self.nativeDeps."kew" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "kew" ]; }; - full."knox"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."keypress"."0.1.x" = + self.by-version."keypress"."0.1.0"; + by-version."keypress"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "keypress-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }) + ]; + buildInputs = + (self.nativeDeps."keypress" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "keypress" ]; + }; + by-spec."knox"."*" = + self.by-version."knox"."0.8.6"; + by-version."knox"."0.8.6" = lib.makeOverridable self.buildNodePackage { name = "knox-0.8.6"; src = [ (fetchurl { @@ -7122,19 +6115,21 @@ }) ]; buildInputs = - (self.nativeDeps."knox"."*" or []); + (self.nativeDeps."knox" or []); deps = [ - self.full."mime"."*" - self.full."xml2js"."0.2.x" - self.full."debug"."~0.7.0" - self.full."stream-counter"."~0.1.0" + self.by-version."mime"."1.2.11" + self.by-version."xml2js"."0.2.8" + self.by-version."debug"."0.7.3" + self.by-version."stream-counter"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "knox" ]; }; - "knox" = self.full."knox"."*"; - full."kue"."*" = lib.makeOverridable self.buildNodePackage { + "knox" = self.by-version."knox"."0.8.6"; + by-spec."kue"."*" = + self.by-version."kue"."0.6.2"; + by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "kue-0.6.2"; src = [ (fetchurl { @@ -7143,21 +6138,23 @@ }) ]; buildInputs = - (self.nativeDeps."kue"."*" or []); + (self.nativeDeps."kue" or []); deps = [ - self.full."redis"."0.7.2" - self.full."express"."~3.1.1" - self.full."jade"."0.26.3" - self.full."stylus"."0.27.2" - self.full."nib"."0.5.0" - self.full."reds"."0.1.4" + self.by-version."redis"."0.7.2" + self.by-version."express"."3.1.2" + self.by-version."jade"."0.26.3" + self.by-version."stylus"."0.27.2" + self.by-version."nib"."0.5.0" + self.by-version."reds"."0.1.4" ]; peerDependencies = [ ]; passthru.names = [ "kue" ]; }; - "kue" = self.full."kue"."*"; - full."lazy"."~1.0.11" = lib.makeOverridable self.buildNodePackage { + "kue" = self.by-version."kue"."0.6.2"; + by-spec."lazy"."~1.0.11" = + self.by-version."lazy"."1.0.11"; + by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { name = "lazy-1.0.11"; src = [ (fetchurl { @@ -7166,14 +6163,16 @@ }) ]; buildInputs = - (self.nativeDeps."lazy"."~1.0.11" or []); + (self.nativeDeps."lazy" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lazy" ]; }; - full."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."lcov-parse"."0.0.4" = + self.by-version."lcov-parse"."0.0.4"; + by-version."lcov-parse"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "lcov-parse-0.0.4"; src = [ (fetchurl { @@ -7182,14 +6181,16 @@ }) ]; buildInputs = - (self.nativeDeps."lcov-parse"."0.0.4" or []); + (self.nativeDeps."lcov-parse" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lcov-parse" ]; }; - full."lcov-result-merger"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."lcov-result-merger"."*" = + self.by-version."lcov-result-merger"."0.0.2"; + by-version."lcov-result-merger"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "lcov-result-merger-0.0.2"; src = [ (fetchurl { @@ -7198,36 +6199,41 @@ }) ]; buildInputs = - (self.nativeDeps."lcov-result-merger"."*" or []); + (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.full."glob"."~3.2.1" + self.by-version."glob"."3.2.6" ]; peerDependencies = [ ]; passthru.names = [ "lcov-result-merger" ]; }; - "lcov-result-merger" = self.full."lcov-result-merger"."*"; - full."less"."~1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "less-1.4.2"; + "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2"; + by-spec."less"."~1.5.0" = + self.by-version."less"."1.5.0"; + by-version."less"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "less-1.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/less/-/less-1.4.2.tgz"; - sha1 = "b7deefe98a3a87bee364411b3df2d1efe5a412d0"; + url = "http://registry.npmjs.org/less/-/less-1.5.0.tgz"; + sha1 = "a97be1d2607577f5f33632a7e098024ab828f699"; }) ]; buildInputs = - (self.nativeDeps."less"."~1.4.0" or []); + (self.nativeDeps."less" or []); deps = [ - self.full."mime"."1.2.x" - self.full."request".">=2.12.0" - self.full."mkdirp"."~0.3.4" - self.full."ycssmin".">=1.0.1" + self.by-version."mime"."1.2.11" + self.by-version."request"."2.27.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."clean-css"."1.0.12" + self.by-version."source-map"."0.1.31" ]; peerDependencies = [ ]; passthru.names = [ "less" ]; }; - full."libxmljs"."~0.8.1" = lib.makeOverridable self.buildNodePackage { + by-spec."libxmljs"."~0.8.1" = + self.by-version."libxmljs"."0.8.1"; + by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage { name = "libxmljs-0.8.1"; src = [ (fetchurl { @@ -7236,15 +6242,17 @@ }) ]; buildInputs = - (self.nativeDeps."libxmljs"."~0.8.1" or []); + (self.nativeDeps."libxmljs" or []); deps = [ - self.full."bindings"."1.0.0" + self.by-version."bindings"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "libxmljs" ]; }; - full."libyaml"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."libyaml"."*" = + self.by-version."libyaml"."0.2.2"; + by-version."libyaml"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "libyaml-0.2.2"; src = [ (fetchurl { @@ -7253,31 +6261,17 @@ }) ]; buildInputs = - (self.nativeDeps."libyaml"."*" or []); + (self.nativeDeps."libyaml" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "libyaml" ]; }; - "libyaml" = self.full."libyaml"."*"; - full."lockfile"."~0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "lockfile-0.3.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lockfile/-/lockfile-0.3.4.tgz"; - sha1 = "932b63546e4915f81b71924b36187740358eda03"; - }) - ]; - buildInputs = - (self.nativeDeps."lockfile"."~0.3.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lockfile" ]; - }; - full."lockfile"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + "libyaml" = self.by-version."libyaml"."0.2.2"; + by-spec."lockfile"."~0.4.0" = + self.by-version."lockfile"."0.4.2"; + by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "lockfile-0.4.2"; src = [ (fetchurl { @@ -7286,14 +6280,16 @@ }) ]; buildInputs = - (self.nativeDeps."lockfile"."~0.4.0" or []); + (self.nativeDeps."lockfile" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lockfile" ]; }; - full."lodash"."~0.9.0" = lib.makeOverridable self.buildNodePackage { + by-spec."lodash"."~0.9.0" = + self.by-version."lodash"."0.9.2"; + by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage { name = "lodash-0.9.2"; src = [ (fetchurl { @@ -7302,14 +6298,16 @@ }) ]; buildInputs = - (self.nativeDeps."lodash"."~0.9.0" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash"."~1.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."lodash"."~1.0.1" = + self.by-version."lodash"."1.0.1"; + by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "lodash-1.0.1"; src = [ (fetchurl { @@ -7318,14 +6316,16 @@ }) ]; buildInputs = - (self.nativeDeps."lodash"."~1.0.1" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash"."~1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."lodash"."~1.1" = + self.by-version."lodash"."1.1.1"; + by-version."lodash"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "lodash-1.1.1"; src = [ (fetchurl { @@ -7334,30 +6334,18 @@ }) ]; buildInputs = - (self.nativeDeps."lodash"."~1.1" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash"."~1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-1.1.1.tgz"; - sha1 = "41a2b2e9a00e64d6d1999f143ff6b0755f6bbb24"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash"."~1.1.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash" ]; - }; - full."lodash"."~1.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."lodash"."~1.1.1" = + self.by-version."lodash"."1.1.1"; + by-spec."lodash"."~1.2.1" = + self.by-version."lodash"."1.2.1"; + by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage { name = "lodash-1.2.1"; src = [ (fetchurl { @@ -7366,14 +6354,16 @@ }) ]; buildInputs = - (self.nativeDeps."lodash"."~1.2.1" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash"."~1.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."lodash"."~1.3.0" = + self.by-version."lodash"."1.3.1"; + by-version."lodash"."1.3.1" = lib.makeOverridable self.buildNodePackage { name = "lodash-1.3.1"; src = [ (fetchurl { @@ -7382,497 +6372,36 @@ }) ]; buildInputs = - (self.nativeDeps."lodash"."~1.3.0" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash"."~1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash-1.3.1"; + by-spec."lodash"."~1.3.1" = + self.by-version."lodash"."1.3.1"; + by-spec."lodash"."~2.2.1" = + self.by-version."lodash"."2.2.1"; + by-version."lodash"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "lodash-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; - sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz"; + sha1 = "ca935fd14ab3c0c872abacf198b9cda501440867"; }) ]; buildInputs = - (self.nativeDeps."lodash"."~1.3.1" or []); + (self.nativeDeps."lodash" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lodash" ]; }; - full."lodash._arraypool"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._arraypool-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.2.1.tgz"; - sha1 = "09c741461dde7a7bc467d826ee50c8b1216427f4"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._arraypool"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._arraypool" ]; - }; - full."lodash._basecreatecallback"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._basecreatecallback-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.2.1.tgz"; - sha1 = "486940419a6f195996cb0f7644af71341c608ce4"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._basecreatecallback"."~2.2.1" or []); - deps = [ - self.full."lodash.bind"."~2.2.1" - self.full."lodash.identity"."~2.2.1" - self.full."lodash._setbinddata"."~2.2.1" - self.full."lodash.support"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._basecreatecallback" ]; - }; - full."lodash._baseisequal"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._baseisequal-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-2.2.1.tgz"; - sha1 = "8bd0156ad5c47d927b58d54456329922b24ce0e7"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._baseisequal"."~2.2.1" or []); - deps = [ - self.full."lodash.forin"."~2.2.1" - self.full."lodash._getarray"."~2.2.1" - self.full."lodash.isfunction"."~2.2.1" - self.full."lodash._objecttypes"."~2.2.1" - self.full."lodash._releasearray"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._baseisequal" ]; - }; - full."lodash._createbound"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._createbound-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._createbound/-/lodash._createbound-2.2.1.tgz"; - sha1 = "27218a40dc73eaf7a1bc90c3f86b0bf79c272ccc"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._createbound"."~2.2.1" or []); - deps = [ - self.full."lodash._createobject"."~2.2.1" - self.full."lodash.isfunction"."~2.2.1" - self.full."lodash.isobject"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - self.full."lodash._setbinddata"."~2.2.1" - self.full."lodash.support"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._createbound" ]; - }; - full."lodash._createobject"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._createobject-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._createobject/-/lodash._createobject-2.2.1.tgz"; - sha1 = "8c38ad5d83de703537c863330b97059417fbfee9"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._createobject"."~2.2.1" or []); - deps = [ - self.full."lodash.isobject"."~2.2.1" - self.full."lodash._noop"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._createobject" ]; - }; - full."lodash._getarray"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._getarray-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.2.1.tgz"; - sha1 = "aa5caa269f1649a186811d5be4a78e56e70e9699"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._getarray"."~2.2.1" or []); - deps = [ - self.full."lodash._arraypool"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._getarray" ]; - }; - full."lodash._maxpoolsize"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._maxpoolsize-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.2.1.tgz"; - sha1 = "1e8b6d433271db7c12ec953d49604ea098542fa7"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._maxpoolsize"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._maxpoolsize" ]; - }; - full."lodash._noop"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._noop-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._noop/-/lodash._noop-2.2.1.tgz"; - sha1 = "f790734f9f683c9fda8da9f4d8a8000a2201c6e9"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._noop"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._noop" ]; - }; - full."lodash._objecttypes"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._objecttypes-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.2.1.tgz"; - sha1 = "c72d42a5dec0b55664f82162ed74c5f3f94942ba"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._objecttypes"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._objecttypes" ]; - }; - full."lodash._releasearray"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._releasearray-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.2.1.tgz"; - sha1 = "81626c89e26ce2fbc90a11ce8f6ef26ea15c4b28"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._releasearray"."~2.2.1" or []); - deps = [ - self.full."lodash._arraypool"."~2.2.1" - self.full."lodash._maxpoolsize"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._releasearray" ]; - }; - full."lodash._renative"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._renative-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._renative/-/lodash._renative-2.2.1.tgz"; - sha1 = "ab77d711371ebae8ffdcf5c83b576d558d6bb522"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._renative"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._renative" ]; - }; - full."lodash._setbinddata"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._setbinddata-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.2.1.tgz"; - sha1 = "df1d5228229c71e28185aae4f828f3b5e78f0904"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._setbinddata"."~2.2.1" or []); - deps = [ - self.full."lodash._noop"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._setbinddata" ]; - }; - full."lodash._shimkeys"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash._shimkeys-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.2.1.tgz"; - sha1 = "ed4e4b5d61214b2685400b185a59fabf59343455"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash._shimkeys"."~2.2.1" or []); - deps = [ - self.full."lodash._objecttypes"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash._shimkeys" ]; - }; - full."lodash.bind"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.bind-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.bind/-/lodash.bind-2.2.1.tgz"; - sha1 = "4c24fe00b4c6fa277e4058d353edcf399b3755c2"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.bind"."~2.2.1" or []); - deps = [ - self.full."lodash._createbound"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.bind" ]; - }; - full."lodash.createcallback"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.createcallback-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.createcallback/-/lodash.createcallback-2.2.1.tgz"; - sha1 = "bb5291c473202a391c1a495a0806bf4b1d1842d2"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.createcallback"."~2.2.1" or []); - deps = [ - self.full."lodash._basecreatecallback"."~2.2.1" - self.full."lodash._baseisequal"."~2.2.1" - self.full."lodash.isobject"."~2.2.1" - self.full."lodash.keys"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.createcallback" ]; - }; - full."lodash.debounce"."~2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash.debounce-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.2.1.tgz"; - sha1 = "46e0ded9b392afa45a8fb54efac564a17fe78be0"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.debounce"."~2.2.0" or []); - deps = [ - self.full."lodash.isfunction"."~2.2.1" - self.full."lodash.isobject"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.debounce" ]; - }; - full."lodash.debounce"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.debounce-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.2.1.tgz"; - sha1 = "46e0ded9b392afa45a8fb54efac564a17fe78be0"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.debounce"."~2.2.1" or []); - deps = [ - self.full."lodash.isfunction"."~2.2.1" - self.full."lodash.isobject"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.debounce" ]; - }; - full."lodash.find"."~2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash.find-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.find/-/lodash.find-2.2.1.tgz"; - sha1 = "768cc2149a589d2fd7b7203c6abe34bcb724d01a"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.find"."~2.2.0" or []); - deps = [ - self.full."lodash.createcallback"."~2.2.1" - self.full."lodash.forown"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.find" ]; - }; - full."lodash.forin"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.forin-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.forin/-/lodash.forin-2.2.1.tgz"; - sha1 = "d96a47f547002f322dcdc533b0f9e914cba7d050"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.forin"."~2.2.1" or []); - deps = [ - self.full."lodash._basecreatecallback"."~2.2.1" - self.full."lodash._objecttypes"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.forin" ]; - }; - full."lodash.forown"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.forown-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.forown/-/lodash.forown-2.2.1.tgz"; - sha1 = "77ee0877c135b603dafe8f2d9ceff215b16458ea"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.forown"."~2.2.1" or []); - deps = [ - self.full."lodash._basecreatecallback"."~2.2.1" - self.full."lodash.keys"."~2.2.1" - self.full."lodash._objecttypes"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.forown" ]; - }; - full."lodash.identity"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.identity-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.identity/-/lodash.identity-2.2.1.tgz"; - sha1 = "63518772143d450a772511f6671e23038c67bcae"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.identity"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.identity" ]; - }; - full."lodash.isfunction"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.isfunction-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.2.1.tgz"; - sha1 = "fcfa79b7b2c072b320468ecdc0244bbbac5e49c0"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.isfunction"."~2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.isfunction" ]; - }; - full."lodash.isobject"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.isobject-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.2.1.tgz"; - sha1 = "cbce101e3e3b718cb51b1113e4597d6e8e038831"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.isobject"."~2.2.1" or []); - deps = [ - self.full."lodash._objecttypes"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.isobject" ]; - }; - full."lodash.keys"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.keys-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-2.2.1.tgz"; - sha1 = "f372597e6f411d7537e32ba0efc85b5f874d5cca"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.keys"."~2.2.1" or []); - deps = [ - self.full."lodash.isobject"."~2.2.1" - self.full."lodash._renative"."~2.2.1" - self.full."lodash._shimkeys"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.keys" ]; - }; - full."lodash.support"."~2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "lodash.support-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.support/-/lodash.support-2.2.1.tgz"; - sha1 = "5b6c267c6fc5302011f0c14e4529c7fbc08e94ce"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.support"."~2.2.1" or []); - deps = [ - self.full."lodash._renative"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.support" ]; - }; - full."lodash.throttle"."~2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "lodash.throttle-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lodash.throttle/-/lodash.throttle-2.2.1.tgz"; - sha1 = "ae49bd6173b0cfb4e09d9645fdac507db77211f0"; - }) - ]; - buildInputs = - (self.nativeDeps."lodash.throttle"."~2.2.0" or []); - deps = [ - self.full."lodash.debounce"."~2.2.1" - self.full."lodash.isfunction"."~2.2.1" - self.full."lodash.isobject"."~2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "lodash.throttle" ]; - }; - full."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."log-driver"."1.2.1" = + self.by-version."log-driver"."1.2.1"; + by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage { name = "log-driver-1.2.1"; src = [ (fetchurl { @@ -7881,14 +6410,16 @@ }) ]; buildInputs = - (self.nativeDeps."log-driver"."1.2.1" or []); + (self.nativeDeps."log-driver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "log-driver" ]; }; - full."log4js"."~0.6.3" = lib.makeOverridable self.buildNodePackage { + by-spec."log4js"."~0.6.3" = + self.by-version."log4js"."0.6.9"; + by-version."log4js"."0.6.9" = lib.makeOverridable self.buildNodePackage { name = "log4js-0.6.9"; src = [ (fetchurl { @@ -7897,17 +6428,19 @@ }) ]; buildInputs = - (self.nativeDeps."log4js"."~0.6.3" or []); + (self.nativeDeps."log4js" or []); deps = [ - self.full."async"."0.1.15" - self.full."semver"."~1.1.4" - self.full."readable-stream"."~1.0.2" + self.by-version."async"."0.1.15" + self.by-version."semver"."1.1.4" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "log4js" ]; }; - full."lru-cache"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."lru-cache"."2" = + self.by-version."lru-cache"."2.3.1"; + by-version."lru-cache"."2.3.1" = lib.makeOverridable self.buildNodePackage { name = "lru-cache-2.3.1"; src = [ (fetchurl { @@ -7916,14 +6449,16 @@ }) ]; buildInputs = - (self.nativeDeps."lru-cache"."2" or []); + (self.nativeDeps."lru-cache" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lru-cache" ]; }; - full."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."lru-cache"."2.2.0" = + self.by-version."lru-cache"."2.2.0"; + by-version."lru-cache"."2.2.0" = lib.makeOverridable self.buildNodePackage { name = "lru-cache-2.2.0"; src = [ (fetchurl { @@ -7932,14 +6467,16 @@ }) ]; buildInputs = - (self.nativeDeps."lru-cache"."2.2.0" or []); + (self.nativeDeps."lru-cache" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lru-cache" ]; }; - full."lru-cache"."2.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."lru-cache"."2.2.x" = + self.by-version."lru-cache"."2.2.4"; + by-version."lru-cache"."2.2.4" = lib.makeOverridable self.buildNodePackage { name = "lru-cache-2.2.4"; src = [ (fetchurl { @@ -7948,14 +6485,16 @@ }) ]; buildInputs = - (self.nativeDeps."lru-cache"."2.2.x" or []); + (self.nativeDeps."lru-cache" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lru-cache" ]; }; - full."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."lru-cache"."2.3.0" = + self.by-version."lru-cache"."2.3.0"; + by-version."lru-cache"."2.3.0" = lib.makeOverridable self.buildNodePackage { name = "lru-cache-2.3.0"; src = [ (fetchurl { @@ -7964,14 +6503,16 @@ }) ]; buildInputs = - (self.nativeDeps."lru-cache"."2.3.0" or []); + (self.nativeDeps."lru-cache" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lru-cache" ]; }; - full."lru-cache"."~1.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."lru-cache"."~1.0.2" = + self.by-version."lru-cache"."1.0.6"; + by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage { name = "lru-cache-1.0.6"; src = [ (fetchurl { @@ -7980,64 +6521,41 @@ }) ]; buildInputs = - (self.nativeDeps."lru-cache"."~1.0.2" or []); + (self.nativeDeps."lru-cache" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "lru-cache" ]; }; - full."lru-cache"."~2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.3.1"; + by-spec."lru-cache"."~2.3.0" = + self.by-version."lru-cache"."2.3.1"; + by-spec."lru-cache"."~2.3.1" = + self.by-version."lru-cache"."2.3.1"; + by-spec."mailcomposer".">= 0.1.27" = + self.by-version."mailcomposer"."0.2.3"; + by-version."mailcomposer"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "mailcomposer-0.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.3.tgz"; + sha1 = "763b96561159ea233cb29ab6995ee45e78be5918"; }) ]; buildInputs = - (self.nativeDeps."lru-cache"."~2.3.0" or []); + (self.nativeDeps."mailcomposer" or []); deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - full."lru-cache"."~2.3.1" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache"."~2.3.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - full."mailcomposer".">= 0.1.27" = lib.makeOverridable self.buildNodePackage { - name = "mailcomposer-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.2.tgz"; - sha1 = "ce93bdea7cb51e60eb76491b6a64c39f382c20e5"; - }) - ]; - buildInputs = - (self.nativeDeps."mailcomposer".">= 0.1.27" or []); - deps = [ - self.full."mimelib"."~0.2" - self.full."mime"."1.2.9" + self.by-version."mimelib"."0.2.14" + self.by-version."mime"."1.2.9" + self.by-version."ent"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mailcomposer" ]; }; - full."match-stream"."~0.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."match-stream"."~0.0.2" = + self.by-version."match-stream"."0.0.2"; + by-version."match-stream"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "match-stream-0.0.2"; src = [ (fetchurl { @@ -8046,16 +6564,18 @@ }) ]; buildInputs = - (self.nativeDeps."match-stream"."~0.0.2" or []); + (self.nativeDeps."match-stream" or []); deps = [ - self.full."buffers"."~0.1.1" - self.full."readable-stream"."~1.0.0" + self.by-version."buffers"."0.1.1" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "match-stream" ]; }; - full."meat"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."meat"."*" = + self.by-version."meat"."0.2.5"; + by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { name = "meat-0.2.5"; src = [ (fetchurl { @@ -8064,21 +6584,23 @@ }) ]; buildInputs = - (self.nativeDeps."meat"."*" or []); + (self.nativeDeps."meat" or []); deps = [ - self.full."express"."2.5.11" - self.full."jade"."0.27.0" - self.full."open"."0.0.2" - self.full."winston"."0.6.2" - self.full."mkdirp"."0.3.0" - self.full."node.extend"."1.0.0" + self.by-version."express"."2.5.11" + self.by-version."jade"."0.27.0" + self.by-version."open"."0.0.2" + self.by-version."winston"."0.6.2" + self.by-version."mkdirp"."0.3.0" + self.by-version."node.extend"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "meat" ]; }; - "meat" = self.full."meat"."*"; - full."memoizee"."~0.2.5" = lib.makeOverridable self.buildNodePackage { + "meat" = self.by-version."meat"."0.2.5"; + by-spec."memoizee"."~0.2.5" = + self.by-version."memoizee"."0.2.6"; + by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage { name = "memoizee-0.2.6"; src = [ (fetchurl { @@ -8087,17 +6609,19 @@ }) ]; buildInputs = - (self.nativeDeps."memoizee"."~0.2.5" or []); + (self.nativeDeps."memoizee" or []); deps = [ - self.full."es5-ext"."~0.9.2" - self.full."event-emitter"."~0.2.2" - self.full."next-tick"."0.1.x" + self.by-version."es5-ext"."0.9.2" + self.by-version."event-emitter"."0.2.2" + self.by-version."next-tick"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "memoizee" ]; }; - full."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."methods"."0.0.1" = + self.by-version."methods"."0.0.1"; + by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "methods-0.0.1"; src = [ (fetchurl { @@ -8106,14 +6630,34 @@ }) ]; buildInputs = - (self.nativeDeps."methods"."0.0.1" or []); + (self.nativeDeps."methods" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "methods" ]; }; - full."mime"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."methods"."0.1.0" = + self.by-version."methods"."0.1.0"; + by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "methods-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }) + ]; + buildInputs = + (self.nativeDeps."methods" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "methods" ]; + }; + by-spec."mime"."*" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.11"; src = [ (fetchurl { @@ -8122,14 +6666,16 @@ }) ]; buildInputs = - (self.nativeDeps."mime"."*" or []); + (self.nativeDeps."mime" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - full."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage { + by-spec."mime"."1.2.4" = + self.by-version."mime"."1.2.4"; + by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.4"; src = [ (fetchurl { @@ -8138,14 +6684,16 @@ }) ]; buildInputs = - (self.nativeDeps."mime"."1.2.4" or []); + (self.nativeDeps."mime" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - full."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage { + by-spec."mime"."1.2.5" = + self.by-version."mime"."1.2.5"; + by-version."mime"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.5"; src = [ (fetchurl { @@ -8154,14 +6702,16 @@ }) ]; buildInputs = - (self.nativeDeps."mime"."1.2.5" or []); + (self.nativeDeps."mime" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - full."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage { + by-spec."mime"."1.2.6" = + self.by-version."mime"."1.2.6"; + by-version."mime"."1.2.6" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.6"; src = [ (fetchurl { @@ -8170,14 +6720,16 @@ }) ]; buildInputs = - (self.nativeDeps."mime"."1.2.6" or []); + (self.nativeDeps."mime" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - full."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage { + by-spec."mime"."1.2.9" = + self.by-version."mime"."1.2.9"; + by-version."mime"."1.2.9" = lib.makeOverridable self.buildNodePackage { name = "mime-1.2.9"; src = [ (fetchurl { @@ -8186,144 +6738,50 @@ }) ]; buildInputs = - (self.nativeDeps."mime"."1.2.9" or []); + (self.nativeDeps."mime" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - full."mime"."1.2.x" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; + by-spec."mime"."1.2.x" = + self.by-version."mime"."1.2.11"; + by-spec."mime".">= 0.0.1" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.2" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.7" = + self.by-version."mime"."1.2.11"; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."mimelib"."~0.2.14" = + self.by-version."mimelib"."0.2.14"; + by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "mimelib-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; }) ]; buildInputs = - (self.nativeDeps."mime"."1.2.x" or []); + (self.nativeDeps."mimelib" or []); deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime".">= 0.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime"."~1.2" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime"."~1.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime"."~1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime"."~1.2.11" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime"."~1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime"."~1.2.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime"."~1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime"."~1.2.7" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mime"."~1.2.9" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime"."~1.2.9" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - full."mimelib"."~0.2" = lib.makeOverridable self.buildNodePackage { - name = "mimelib-0.2.13"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.13.tgz"; - sha1 = "0668eb85e870c510be747a67ece43b9bbf8e20b0"; - }) - ]; - buildInputs = - (self.nativeDeps."mimelib"."~0.2" or []); - deps = [ - self.full."encoding"."~0.1" - self.full."addressparser"."~0.1" + self.by-version."encoding"."0.1.7" + self.by-version."addressparser"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "mimelib" ]; }; - full."minimatch"."0" = lib.makeOverridable self.buildNodePackage { + by-spec."minimatch"."0" = + self.by-version."minimatch"."0.2.12"; + by-version."minimatch"."0.2.12" = lib.makeOverridable self.buildNodePackage { name = "minimatch-0.2.12"; src = [ (fetchurl { @@ -8332,16 +6790,18 @@ }) ]; buildInputs = - (self.nativeDeps."minimatch"."0" or []); + (self.nativeDeps."minimatch" or []); deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" + self.by-version."lru-cache"."2.3.1" + self.by-version."sigmund"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "minimatch" ]; }; - full."minimatch"."0.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."minimatch"."0.0.x" = + self.by-version."minimatch"."0.0.5"; + by-version."minimatch"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "minimatch-0.0.5"; src = [ (fetchurl { @@ -8350,195 +6810,37 @@ }) ]; buildInputs = - (self.nativeDeps."minimatch"."0.0.x" or []); + (self.nativeDeps."minimatch" or []); deps = [ - self.full."lru-cache"."~1.0.2" + self.by-version."lru-cache"."1.0.6" ]; peerDependencies = [ ]; passthru.names = [ "minimatch" ]; }; - full."minimatch"."0.2.x" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."0.2.x" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."0.x" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."0.x" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."0.x.x" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."0.x.x" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch".">=0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch".">=0.2.4" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2.0" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2.11" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2.11" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2.12" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2.6" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimatch"."~0.2.9" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; - sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch"."~0.2.9" or []); - deps = [ - self.full."lru-cache"."2" - self.full."sigmund"."~1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."minimatch"."0.2.x" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."0.x" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."0.x.x" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch".">=0.2.4" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2.11" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2.12" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2.6" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimatch"."~0.2.9" = + self.by-version."minimatch"."0.2.12"; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.5"; + by-version."minimist"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "minimist-0.0.5"; src = [ (fetchurl { @@ -8547,14 +6849,16 @@ }) ]; buildInputs = - (self.nativeDeps."minimist"."~0.0.1" or []); + (self.nativeDeps."minimist" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "minimist" ]; }; - full."mkdirp"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."mkdirp"."*" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "mkdirp-0.3.5"; src = [ (fetchurl { @@ -8563,47 +6867,21 @@ }) ]; buildInputs = - (self.nativeDeps."mkdirp"."*" or []); + (self.nativeDeps."mkdirp" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; - "mkdirp" = self.full."mkdirp"."*"; - full."mkdirp"."0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."0.3" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."0.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.3" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.3.0" = + self.by-version."mkdirp"."0.3.0"; + by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "mkdirp-0.3.0"; src = [ (fetchurl { @@ -8612,183 +6890,75 @@ }) ]; buildInputs = - (self.nativeDeps."mkdirp"."0.3.0" or []); + (self.nativeDeps."mkdirp" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; - full."mkdirp"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.4"; + by-spec."mkdirp"."0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."0.3.x" = + 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.3" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."~0.3.4" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."~0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-spec."mocha"."*" = + self.by-version."mocha"."1.14.0"; + by-version."mocha"."1.14.0" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.14.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.4.tgz"; - sha1 = "f8c81d213b7299a031f193a57d752a17d2f6c7d8"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.14.0.tgz"; + sha1 = "713db6dc5000191a9d0358195d0908790ecb6157"; }) ]; buildInputs = - (self.nativeDeps."mkdirp"."0.3.4" or []); + (self.nativeDeps."mocha" or []); deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."0.3.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."0.3.x" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."0.3.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."0.x.x" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."0.x.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."~0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."~0.3.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."~0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."~0.3.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mkdirp"."~0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp"."~0.3.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - full."mocha"."*" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.13.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz"; - sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c"; - }) - ]; - buildInputs = - (self.nativeDeps."mocha"."*" or []); - deps = [ - self.full."commander"."0.6.1" - self.full."growl"."1.7.x" - self.full."jade"."0.26.3" - self.full."diff"."1.0.7" - self.full."debug"."*" - self.full."mkdirp"."0.3.5" - self.full."glob"."3.2.3" + self.by-version."commander"."2.0.0" + 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.3" + self.by-version."mkdirp"."0.3.5" + self.by-version."glob"."3.2.3" ]; peerDependencies = [ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.full."mocha"."*"; - full."mocha-unfunk-reporter"."*" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.2.3"; + "mocha" = self.by-version."mocha"."1.14.0"; + by-spec."mocha-unfunk-reporter"."*" = + self.by-version."mocha-unfunk-reporter"."0.3.4"; + by-version."mocha-unfunk-reporter"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.2.3.tgz"; - sha1 = "41c2aa001dc44eef80d073404728d2e4d4a09c90"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.4.tgz"; + sha1 = "79c5977520677a6b8944106896b320481a4dd737"; }) ]; buildInputs = - (self.nativeDeps."mocha-unfunk-reporter"."*" or []); + (self.nativeDeps."mocha-unfunk-reporter" or []); deps = [ + self.by-version."jsesc"."0.4.3" + self.by-version."diff"."1.0.7" ]; peerDependencies = [ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.full."mocha-unfunk-reporter"."*"; - full."moment"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "moment-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.0.0.tgz"; - sha1 = "2bbc5b44c321837693ab6efcadbd46ed946211fe"; - }) - ]; - buildInputs = - (self.nativeDeps."moment"."2.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "moment" ]; - }; - full."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.4"; + by-spec."moment"."2.1.0" = + self.by-version."moment"."2.1.0"; + by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "moment-2.1.0"; src = [ (fetchurl { @@ -8797,14 +6967,34 @@ }) ]; buildInputs = - (self.nativeDeps."moment"."2.1.0" or []); + (self.nativeDeps."moment" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "moment" ]; }; - full."mongodb"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."moment"."~2.4.0" = + self.by-version."moment"."2.4.0"; + by-version."moment"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "moment-2.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz"; + sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d"; + }) + ]; + buildInputs = + (self.nativeDeps."moment" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "moment" ]; + }; + by-spec."mongodb"."*" = + self.by-version."mongodb"."1.3.19"; + by-version."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { name = "mongodb-1.3.19"; src = [ (fetchurl { @@ -8813,17 +7003,19 @@ }) ]; buildInputs = - (self.nativeDeps."mongodb"."*" or []); + (self.nativeDeps."mongodb" or []); deps = [ - self.full."bson"."0.2.2" - self.full."kerberos"."0.0.3" + self.by-version."bson"."0.2.2" + self.by-version."kerberos"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.full."mongodb"."*"; - full."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { + "mongodb" = self.by-version."mongodb"."1.3.19"; + by-spec."mongodb"."1.2.14" = + self.by-version."mongodb"."1.2.14"; + by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { name = "mongodb-1.2.14"; src = [ (fetchurl { @@ -8832,75 +7024,48 @@ }) ]; buildInputs = - (self.nativeDeps."mongodb"."1.2.14" or []); + (self.nativeDeps."mongodb" or []); deps = [ - self.full."bson"."0.1.8" + self.by-version."bson"."0.1.8" ]; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - full."mongodb"."1.2.x" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.2.14"; + by-spec."mongodb"."1.2.x" = + self.by-version."mongodb"."1.2.14"; + by-spec."mongodb"."1.3.19" = + self.by-version."mongodb"."1.3.19"; + by-spec."mongoose"."*" = + self.by-version."mongoose"."3.8.0"; + by-version."mongoose"."3.8.0" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; - sha1 = "269665552066437308d0942036646e6795c3a9a3"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.0.tgz"; + sha1 = "0e7b34fe90ad996c72ce7cfec6822176ea137e48"; }) ]; buildInputs = - (self.nativeDeps."mongodb"."1.2.x" or []); + (self.nativeDeps."mongoose" or []); deps = [ - self.full."bson"."0.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mongodb" ]; - }; - full."mongodb"."1.3.19" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.19"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz"; - sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4"; - }) - ]; - buildInputs = - (self.nativeDeps."mongodb"."1.3.19" or []); - deps = [ - self.full."bson"."0.2.2" - self.full."kerberos"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mongodb" ]; - }; - full."mongoose"."*" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.7.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.4.tgz"; - sha1 = "5ed8cdbc91c92b18ab49ac3526c7ac5264c7b292"; - }) - ]; - buildInputs = - (self.nativeDeps."mongoose"."*" or []); - deps = [ - self.full."hooks"."0.2.1" - self.full."mongodb"."1.3.19" - self.full."ms"."0.1.0" - self.full."sliced"."0.0.5" - self.full."muri"."0.3.1" - self.full."mpromise"."0.3.0" - self.full."mpath"."0.1.1" - self.full."regexp-clone"."0.0.1" - self.full."mquery"."0.3.2" + self.by-version."hooks"."0.2.1" + self.by-version."mongodb"."1.3.19" + self.by-version."ms"."0.1.0" + self.by-version."sliced"."0.0.5" + self.by-version."muri"."0.3.1" + self.by-version."mpromise"."0.3.0" + self.by-version."mpath"."0.1.1" + self.by-version."regexp-clone"."0.0.1" + self.by-version."mquery"."0.3.2" ]; peerDependencies = [ ]; passthru.names = [ "mongoose" ]; }; - full."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { + by-spec."mongoose"."3.6.7" = + self.by-version."mongoose"."3.6.7"; + by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { name = "mongoose-3.6.7"; src = [ (fetchurl { @@ -8909,21 +7074,23 @@ }) ]; buildInputs = - (self.nativeDeps."mongoose"."3.6.7" or []); + (self.nativeDeps."mongoose" or []); deps = [ - self.full."hooks"."0.2.1" - self.full."mongodb"."1.2.14" - self.full."ms"."0.1.0" - self.full."sliced"."0.0.3" - self.full."muri"."0.3.1" - self.full."mpromise"."0.2.1" - self.full."mpath"."0.1.1" + self.by-version."hooks"."0.2.1" + self.by-version."mongodb"."1.2.14" + self.by-version."ms"."0.1.0" + self.by-version."sliced"."0.0.3" + self.by-version."muri"."0.3.1" + self.by-version."mpromise"."0.2.1" + self.by-version."mpath"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "mongoose" ]; }; - full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage { + by-spec."mongoose"."3.6.x" = + self.by-version."mongoose"."3.6.20"; + by-version."mongoose"."3.6.20" = lib.makeOverridable self.buildNodePackage { name = "mongoose-3.6.20"; src = [ (fetchurl { @@ -8932,23 +7099,25 @@ }) ]; buildInputs = - (self.nativeDeps."mongoose"."3.6.x" or []); + (self.nativeDeps."mongoose" or []); deps = [ - self.full."hooks"."0.2.1" - self.full."mongodb"."1.3.19" - self.full."ms"."0.1.0" - self.full."sliced"."0.0.5" - self.full."muri"."0.3.1" - self.full."mpromise"."0.2.1" - self.full."mpath"."0.1.1" - self.full."regexp-clone"."0.0.1" + self.by-version."hooks"."0.2.1" + self.by-version."mongodb"."1.3.19" + self.by-version."ms"."0.1.0" + self.by-version."sliced"."0.0.5" + self.by-version."muri"."0.3.1" + self.by-version."mpromise"."0.2.1" + self.by-version."mpath"."0.1.1" + self.by-version."regexp-clone"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "mongoose" ]; }; - "mongoose" = self.full."mongoose"."3.6.x"; - full."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage { + "mongoose" = self.by-version."mongoose"."3.6.20"; + by-spec."mongoose-lifecycle"."1.0.0" = + self.by-version."mongoose-lifecycle"."1.0.0"; + by-version."mongoose-lifecycle"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "mongoose-lifecycle-1.0.0"; src = [ (fetchurl { @@ -8957,14 +7126,16 @@ }) ]; buildInputs = - (self.nativeDeps."mongoose-lifecycle"."1.0.0" or []); + (self.nativeDeps."mongoose-lifecycle" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mongoose-lifecycle" ]; }; - full."mongoose-schema-extend"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."mongoose-schema-extend"."*" = + self.by-version."mongoose-schema-extend"."0.1.5"; + by-version."mongoose-schema-extend"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "mongoose-schema-extend-0.1.5"; src = [ (fetchurl { @@ -8973,16 +7144,18 @@ }) ]; buildInputs = - (self.nativeDeps."mongoose-schema-extend"."*" or []); + (self.nativeDeps."mongoose-schema-extend" or []); deps = [ - self.full."owl-deepcopy"."~0.0.1" + self.by-version."owl-deepcopy"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "mongoose-schema-extend" ]; }; - "mongoose-schema-extend" = self.full."mongoose-schema-extend"."*"; - full."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage { + "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.5"; + by-spec."monocle"."1.1.50" = + self.by-version."monocle"."1.1.50"; + by-version."monocle"."1.1.50" = lib.makeOverridable self.buildNodePackage { name = "monocle-1.1.50"; src = [ (fetchurl { @@ -8991,15 +7164,17 @@ }) ]; buildInputs = - (self.nativeDeps."monocle"."1.1.50" or []); + (self.nativeDeps."monocle" or []); deps = [ - self.full."readdirp"."~0.2.3" + self.by-version."readdirp"."0.2.5" ]; peerDependencies = [ ]; passthru.names = [ "monocle" ]; }; - full."mout"."~0.6.0" = lib.makeOverridable self.buildNodePackage { + by-spec."mout"."~0.6.0" = + self.by-version."mout"."0.6.0"; + by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "mout-0.6.0"; src = [ (fetchurl { @@ -9008,14 +7183,16 @@ }) ]; buildInputs = - (self.nativeDeps."mout"."~0.6.0" or []); + (self.nativeDeps."mout" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mout" ]; }; - full."mout"."~0.7.0" = lib.makeOverridable self.buildNodePackage { + by-spec."mout"."~0.7.0" = + self.by-version."mout"."0.7.1"; + by-version."mout"."0.7.1" = lib.makeOverridable self.buildNodePackage { name = "mout-0.7.1"; src = [ (fetchurl { @@ -9024,14 +7201,16 @@ }) ]; buildInputs = - (self.nativeDeps."mout"."~0.7.0" or []); + (self.nativeDeps."mout" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mout" ]; }; - full."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."mpath"."0.1.1" = + self.by-version."mpath"."0.1.1"; + by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "mpath-0.1.1"; src = [ (fetchurl { @@ -9040,14 +7219,16 @@ }) ]; buildInputs = - (self.nativeDeps."mpath"."0.1.1" or []); + (self.nativeDeps."mpath" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mpath" ]; }; - full."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."mpromise"."0.2.1" = + self.by-version."mpromise"."0.2.1"; + by-version."mpromise"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "mpromise-0.2.1"; src = [ (fetchurl { @@ -9056,15 +7237,17 @@ }) ]; buildInputs = - (self.nativeDeps."mpromise"."0.2.1" or []); + (self.nativeDeps."mpromise" or []); deps = [ - self.full."sliced"."0.0.4" + self.by-version."sliced"."0.0.4" ]; peerDependencies = [ ]; passthru.names = [ "mpromise" ]; }; - full."mpromise"."0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."mpromise"."0.3.0" = + self.by-version."mpromise"."0.3.0"; + by-version."mpromise"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "mpromise-0.3.0"; src = [ (fetchurl { @@ -9073,15 +7256,17 @@ }) ]; buildInputs = - (self.nativeDeps."mpromise"."0.3.0" or []); + (self.nativeDeps."mpromise" or []); deps = [ - self.full."sliced"."0.0.5" + self.by-version."sliced"."0.0.5" ]; peerDependencies = [ ]; passthru.names = [ "mpromise" ]; }; - full."mquery"."0.3.2" = lib.makeOverridable self.buildNodePackage { + by-spec."mquery"."0.3.2" = + self.by-version."mquery"."0.3.2"; + by-version."mquery"."0.3.2" = lib.makeOverridable self.buildNodePackage { name = "mquery-0.3.2"; src = [ (fetchurl { @@ -9090,17 +7275,19 @@ }) ]; buildInputs = - (self.nativeDeps."mquery"."0.3.2" or []); + (self.nativeDeps."mquery" or []); deps = [ - self.full."sliced"."0.0.5" - self.full."debug"."0.7.0" - self.full."regexp-clone"."0.0.1" + self.by-version."sliced"."0.0.5" + self.by-version."debug"."0.7.0" + self.by-version."regexp-clone"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "mquery" ]; }; - full."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."ms"."0.1.0" = + self.by-version."ms"."0.1.0"; + by-version."ms"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "ms-0.1.0"; src = [ (fetchurl { @@ -9109,14 +7296,16 @@ }) ]; buildInputs = - (self.nativeDeps."ms"."0.1.0" or []); + (self.nativeDeps."ms" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ms" ]; }; - full."msgpack".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."msgpack".">= 0.0.1" = + self.by-version."msgpack"."0.2.1"; + by-version."msgpack"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "msgpack-0.2.1"; src = [ (fetchurl { @@ -9125,14 +7314,16 @@ }) ]; buildInputs = - (self.nativeDeps."msgpack".">= 0.0.1" or []); + (self.nativeDeps."msgpack" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "msgpack" ]; }; - full."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."multiparty"."2.2.0" = + self.by-version."multiparty"."2.2.0"; + by-version."multiparty"."2.2.0" = lib.makeOverridable self.buildNodePackage { name = "multiparty-2.2.0"; src = [ (fetchurl { @@ -9141,16 +7332,18 @@ }) ]; buildInputs = - (self.nativeDeps."multiparty"."2.2.0" or []); + (self.nativeDeps."multiparty" or []); deps = [ - self.full."readable-stream"."~1.1.9" - self.full."stream-counter"."~0.2.0" + self.by-version."readable-stream"."1.1.9" + self.by-version."stream-counter"."0.2.0" ]; peerDependencies = [ ]; passthru.names = [ "multiparty" ]; }; - full."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { + by-spec."muri"."0.3.1" = + self.by-version."muri"."0.3.1"; + by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "muri-0.3.1"; src = [ (fetchurl { @@ -9159,14 +7352,16 @@ }) ]; buildInputs = - (self.nativeDeps."muri"."0.3.1" or []); + (self.nativeDeps."muri" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "muri" ]; }; - full."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."mute-stream"."0.0.3" = + self.by-version."mute-stream"."0.0.3"; + by-version."mute-stream"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "mute-stream-0.0.3"; src = [ (fetchurl { @@ -9175,14 +7370,16 @@ }) ]; buildInputs = - (self.nativeDeps."mute-stream"."0.0.3" or []); + (self.nativeDeps."mute-stream" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mute-stream" ]; }; - full."mute-stream"."~0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.4"; + by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "mute-stream-0.0.4"; src = [ (fetchurl { @@ -9191,14 +7388,16 @@ }) ]; buildInputs = - (self.nativeDeps."mute-stream"."~0.0.4" or []); + (self.nativeDeps."mute-stream" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mute-stream" ]; }; - full."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."mv"."0.0.5" = + self.by-version."mv"."0.0.5"; + by-version."mv"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "mv-0.0.5"; src = [ (fetchurl { @@ -9207,14 +7406,16 @@ }) ]; buildInputs = - (self.nativeDeps."mv"."0.0.5" or []); + (self.nativeDeps."mv" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "mv" ]; }; - full."nan"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."nan"."~0.3.0" = + self.by-version."nan"."0.3.2"; + by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage { name = "nan-0.3.2"; src = [ (fetchurl { @@ -9223,14 +7424,16 @@ }) ]; buildInputs = - (self.nativeDeps."nan"."~0.3.0" or []); + (self.nativeDeps."nan" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "nan" ]; }; - full."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { + by-spec."natural"."0.0.69" = + self.by-version."natural"."0.0.69"; + by-version."natural"."0.0.69" = lib.makeOverridable self.buildNodePackage { name = "natural-0.0.69"; src = [ (fetchurl { @@ -9239,17 +7442,42 @@ }) ]; buildInputs = - (self.nativeDeps."natural"."0.0.69" or []); + (self.nativeDeps."natural" or []); deps = [ - self.full."sylvester".">= 0.0.12" - self.full."apparatus".">= 0.0.4" - self.full."underscore"."*" + self.by-version."sylvester"."0.0.21" + self.by-version."apparatus"."0.0.7" + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "natural" ]; }; - full."nconf"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."nconf"."*" = + self.by-version."nconf"."0.6.8"; + by-version."nconf"."0.6.8" = lib.makeOverridable self.buildNodePackage { + name = "nconf-0.6.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/nconf/-/nconf-0.6.8.tgz"; + sha1 = "bb54b5f660eb3f44d8b2cdccaa5d60453973ffb0"; + }) + ]; + buildInputs = + (self.nativeDeps."nconf" or []); + deps = [ + self.by-version."async"."0.1.22" + self.by-version."ini"."1.1.0" + self.by-version."optimist"."0.3.7" + self.by-version."pkginfo"."0.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "nconf" ]; + }; + "nconf" = self.by-version."nconf"."0.6.8"; + by-spec."nconf"."0.6.7" = + self.by-version."nconf"."0.6.7"; + by-version."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage { name = "nconf-0.6.7"; src = [ (fetchurl { @@ -9258,39 +7486,20 @@ }) ]; buildInputs = - (self.nativeDeps."nconf"."*" or []); + (self.nativeDeps."nconf" or []); deps = [ - self.full."async"."0.1.x" - self.full."ini"."1.x.x" - self.full."optimist"."0.3.x" - self.full."pkginfo"."0.2.x" + self.by-version."async"."0.1.22" + self.by-version."ini"."1.1.0" + self.by-version."optimist"."0.3.7" + self.by-version."pkginfo"."0.2.3" ]; peerDependencies = [ ]; passthru.names = [ "nconf" ]; }; - "nconf" = self.full."nconf"."*"; - full."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage { - name = "nconf-0.6.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz"; - sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c"; - }) - ]; - buildInputs = - (self.nativeDeps."nconf"."0.6.7" or []); - deps = [ - self.full."async"."0.1.x" - self.full."ini"."1.x.x" - self.full."optimist"."0.3.x" - self.full."pkginfo"."0.2.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nconf" ]; - }; - full."ncp"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."ncp"."0.2.x" = + self.by-version."ncp"."0.2.7"; + by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage { name = "ncp-0.2.7"; src = [ (fetchurl { @@ -9299,14 +7508,16 @@ }) ]; buildInputs = - (self.nativeDeps."ncp"."0.2.x" or []); + (self.nativeDeps."ncp" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ncp" ]; }; - full."ncp"."0.4.2" = lib.makeOverridable self.buildNodePackage { + by-spec."ncp"."0.4.2" = + self.by-version."ncp"."0.4.2"; + by-version."ncp"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "ncp-0.4.2"; src = [ (fetchurl { @@ -9315,14 +7526,16 @@ }) ]; buildInputs = - (self.nativeDeps."ncp"."0.4.2" or []); + (self.nativeDeps."ncp" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "ncp" ]; }; - full."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage { + by-spec."negotiator"."0.2.5" = + self.by-version."negotiator"."0.2.5"; + by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage { name = "negotiator-0.2.5"; src = [ (fetchurl { @@ -9331,14 +7544,34 @@ }) ]; buildInputs = - (self.nativeDeps."negotiator"."0.2.5" or []); + (self.nativeDeps."negotiator" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "negotiator" ]; }; - full."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { + by-spec."negotiator"."0.3.0" = + self.by-version."negotiator"."0.3.0"; + by-version."negotiator"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; + }) + ]; + buildInputs = + (self.nativeDeps."negotiator" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "negotiator" ]; + }; + by-spec."net-ping"."1.1.7" = + self.by-version."net-ping"."1.1.7"; + by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { name = "net-ping-1.1.7"; src = [ (fetchurl { @@ -9347,15 +7580,17 @@ }) ]; buildInputs = - (self.nativeDeps."net-ping"."1.1.7" or []); + (self.nativeDeps."net-ping" or []); deps = [ - self.full."raw-socket"."*" + self.by-version."raw-socket"."1.2.2" ]; peerDependencies = [ ]; passthru.names = [ "net-ping" ]; }; - full."next-tick"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."next-tick"."0.1.x" = + self.by-version."next-tick"."0.1.0"; + by-version."next-tick"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "next-tick-0.1.0"; src = [ (fetchurl { @@ -9364,14 +7599,16 @@ }) ]; buildInputs = - (self.nativeDeps."next-tick"."0.1.x" or []); + (self.nativeDeps."next-tick" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "next-tick" ]; }; - full."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."nib"."0.5.0" = + self.by-version."nib"."0.5.0"; + by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage { name = "nib-0.5.0"; src = [ (fetchurl { @@ -9380,14 +7617,16 @@ }) ]; buildInputs = - (self.nativeDeps."nib"."0.5.0" or []); + (self.nativeDeps."nib" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "nib" ]; }; - full."nijs"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."nijs"."*" = + self.by-version."nijs"."0.0.12"; + by-version."nijs"."0.0.12" = lib.makeOverridable self.buildNodePackage { name = "nijs-0.0.12"; src = [ (fetchurl { @@ -9396,16 +7635,18 @@ }) ]; buildInputs = - (self.nativeDeps."nijs"."*" or []); + (self.nativeDeps."nijs" or []); deps = [ - self.full."optparse".">= 1.0.3" + self.by-version."optparse"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "nijs" ]; }; - "nijs" = self.full."nijs"."*"; - full."node-expat"."*" = lib.makeOverridable self.buildNodePackage { + "nijs" = self.by-version."nijs"."0.0.12"; + by-spec."node-expat"."*" = + self.by-version."node-expat"."2.0.0"; + by-version."node-expat"."2.0.0" = lib.makeOverridable self.buildNodePackage { name = "node-expat-2.0.0"; src = [ (fetchurl { @@ -9414,103 +7655,51 @@ }) ]; buildInputs = - (self.nativeDeps."node-expat"."*" or []); + (self.nativeDeps."node-expat" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.full."node-expat"."*"; - full."node-gyp"."*" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.10"; + "node-expat" = self.by-version."node-expat"."2.0.0"; + by-spec."node-gyp"."*" = + self.by-version."node-gyp"."0.11.0"; + by-version."node-gyp"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.11.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; - sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.11.0.tgz"; + sha1 = "ee61d3f9a2cf4e9e2c00293d86620096e0184411"; }) ]; buildInputs = - (self.nativeDeps."node-gyp"."*" or []); + (self.nativeDeps."node-gyp" or []); deps = [ - self.full."glob"."3" - self.full."graceful-fs"."2" - self.full."fstream"."0" - self.full."minimatch"."0" - self.full."mkdirp"."0" - self.full."nopt"."2" - self.full."npmlog"."0" - self.full."osenv"."0" - self.full."request"."2" - self.full."rimraf"."2" - self.full."semver"."~2.1" - self.full."tar"."0" - self.full."which"."1" + self.by-version."glob"."3.2.6" + self.by-version."graceful-fs"."2.0.1" + self.by-version."fstream"."0.1.24" + self.by-version."minimatch"."0.2.12" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.1.2" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.27.0" + self.by-version."rimraf"."2.2.2" + self.by-version."semver"."2.2.1" + self.by-version."tar"."0.1.18" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.full."node-gyp"."*"; - full."node-gyp"."~0.10.10" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; - sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp"."~0.10.10" or []); - deps = [ - self.full."glob"."3" - self.full."graceful-fs"."2" - self.full."fstream"."0" - self.full."minimatch"."0" - self.full."mkdirp"."0" - self.full."nopt"."2" - self.full."npmlog"."0" - self.full."osenv"."0" - self.full."request"."2" - self.full."rimraf"."2" - self.full."semver"."~2.1" - self.full."tar"."0" - self.full."which"."1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; - full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; - sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp"."~0.10.2" or []); - deps = [ - self.full."glob"."3" - self.full."graceful-fs"."2" - self.full."fstream"."0" - self.full."minimatch"."0" - self.full."mkdirp"."0" - self.full."nopt"."2" - self.full."npmlog"."0" - self.full."osenv"."0" - self.full."request"."2" - self.full."rimraf"."2" - self.full."semver"."~2.1" - self.full."tar"."0" - self.full."which"."1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; - full."node-inspector"."*" = lib.makeOverridable self.buildNodePackage { + "node-gyp" = self.by-version."node-gyp"."0.11.0"; + by-spec."node-gyp"."~0.11.0" = + self.by-version."node-gyp"."0.11.0"; + by-spec."node-inspector"."*" = + self.by-version."node-inspector"."0.5.0"; + by-version."node-inspector"."0.5.0" = lib.makeOverridable self.buildNodePackage { name = "node-inspector-0.5.0"; src = [ (fetchurl { @@ -9519,21 +7708,23 @@ }) ]; buildInputs = - (self.nativeDeps."node-inspector"."*" or []); + (self.nativeDeps."node-inspector" or []); deps = [ - self.full."socket.io"."~0.9.14" - self.full."express"."~3.4" - self.full."async"."~0.2.8" - self.full."glob"."~3.2.1" - self.full."rc"."~0.3.0" - self.full."strong-data-uri"."~0.1.0" + self.by-version."socket.io"."0.9.16" + self.by-version."express"."3.4.4" + self.by-version."async"."0.2.9" + self.by-version."glob"."3.2.6" + self.by-version."rc"."0.3.1" + self.by-version."strong-data-uri"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.full."node-inspector"."*"; - full."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { + "node-inspector" = self.by-version."node-inspector"."0.5.0"; + by-spec."node-syslog"."1.1.3" = + self.by-version."node-syslog"."1.1.3"; + by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { name = "node-syslog-1.1.3"; src = [ (fetchurl { @@ -9542,14 +7733,16 @@ }) ]; buildInputs = - (self.nativeDeps."node-syslog"."1.1.3" or []); + (self.nativeDeps."node-syslog" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-syslog" ]; }; - full."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = lib.makeOverridable self.buildNodePackage { + by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = + self.by-version."node-uptime"."3.2.0"; + by-version."node-uptime"."3.2.0" = lib.makeOverridable self.buildNodePackage { name = "node-uptime-3.2.0"; src = [ (fetchurl { @@ -9558,29 +7751,31 @@ }) ]; buildInputs = - (self.nativeDeps."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" or []); + (self.nativeDeps."node-uptime" or []); deps = [ - self.full."mongoose"."3.6.7" - self.full."mongoose-lifecycle"."1.0.0" - self.full."express"."3.2.0" - self.full."express-partials"."0.0.6" - self.full."connect-flash"."0.1.0" - self.full."ejs"."0.8.3" - self.full."config"."0.4.15" - self.full."async"."0.1.22" - self.full."socket.io"."0.9.14" - self.full."semver"."1.1.0" - self.full."moment"."2.1.0" - self.full."nodemailer"."0.3.35" - self.full."net-ping"."1.1.7" - self.full."js-yaml"."2.1.0" + self.by-version."mongoose"."3.6.7" + self.by-version."mongoose-lifecycle"."1.0.0" + self.by-version."express"."3.2.0" + self.by-version."express-partials"."0.0.6" + self.by-version."connect-flash"."0.1.0" + self.by-version."ejs"."0.8.3" + self.by-version."config"."0.4.15" + self.by-version."async"."0.1.22" + self.by-version."socket.io"."0.9.14" + self.by-version."semver"."1.1.0" + self.by-version."moment"."2.1.0" + self.by-version."nodemailer"."0.3.35" + self.by-version."net-ping"."1.1.7" + self.by-version."js-yaml"."2.1.0" ]; peerDependencies = [ ]; passthru.names = [ "node-uptime" ]; }; - "node-uptime" = self.full."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; - full."node-uuid"."*" = lib.makeOverridable self.buildNodePackage { + "node-uptime" = self.by-version."node-uptime"."3.2.0"; + by-spec."node-uuid"."*" = + self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { name = "node-uuid-1.4.1"; src = [ (fetchurl { @@ -9589,15 +7784,17 @@ }) ]; buildInputs = - (self.nativeDeps."node-uuid"."*" or []); + (self.nativeDeps."node-uuid" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; }; - "node-uuid" = self.full."node-uuid"."*"; - full."node-uuid"."1.2.0" = lib.makeOverridable self.buildNodePackage { + "node-uuid" = self.by-version."node-uuid"."1.4.1"; + by-spec."node-uuid"."1.2.0" = + self.by-version."node-uuid"."1.2.0"; + by-version."node-uuid"."1.2.0" = lib.makeOverridable self.buildNodePackage { name = "node-uuid-1.2.0"; src = [ (fetchurl { @@ -9606,14 +7803,16 @@ }) ]; buildInputs = - (self.nativeDeps."node-uuid"."1.2.0" or []); + (self.nativeDeps."node-uuid" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; }; - full."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { + by-spec."node-uuid"."1.3.3" = + self.by-version."node-uuid"."1.3.3"; + by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { name = "node-uuid-1.3.3"; src = [ (fetchurl { @@ -9622,14 +7821,16 @@ }) ]; buildInputs = - (self.nativeDeps."node-uuid"."1.3.3" or []); + (self.nativeDeps."node-uuid" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; }; - full."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."node-uuid"."1.4.0" = + self.by-version."node-uuid"."1.4.0"; + by-version."node-uuid"."1.4.0" = lib.makeOverridable self.buildNodePackage { name = "node-uuid-1.4.0"; src = [ (fetchurl { @@ -9638,30 +7839,18 @@ }) ]; buildInputs = - (self.nativeDeps."node-uuid"."1.4.0" or []); + (self.nativeDeps."node-uuid" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; }; - full."node-uuid"."~1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid"."~1.4.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; - }; - full."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.1"; + by-spec."node.extend"."1.0.0" = + self.by-version."node.extend"."1.0.0"; + by-version."node.extend"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "node.extend-1.0.0"; src = [ (fetchurl { @@ -9670,14 +7859,16 @@ }) ]; buildInputs = - (self.nativeDeps."node.extend"."1.0.0" or []); + (self.nativeDeps."node.extend" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "node.extend" ]; }; - full."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage { + by-spec."nodemailer"."0.3.35" = + self.by-version."nodemailer"."0.3.35"; + by-version."nodemailer"."0.3.35" = lib.makeOverridable self.buildNodePackage { name = "nodemailer-0.3.35"; src = [ (fetchurl { @@ -9686,52 +7877,59 @@ }) ]; buildInputs = - (self.nativeDeps."nodemailer"."0.3.35" or []); + (self.nativeDeps."nodemailer" or []); deps = [ - self.full."mailcomposer".">= 0.1.27" - self.full."simplesmtp".">= 0.1.22" - self.full."optimist"."*" + self.by-version."mailcomposer"."0.2.3" + self.by-version."simplesmtp"."0.3.13" + self.by-version."optimist"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "nodemailer" ]; }; - full."nodemon"."*" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.7.10"; + by-spec."nodemon"."*" = + self.by-version."nodemon"."0.9.6"; + by-version."nodemon"."0.9.6" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz"; - sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.6.tgz"; + sha1 = "7a0b135b9b9c56e7a73025bbac8d6d3dc8dcd5c9"; }) ]; buildInputs = - (self.nativeDeps."nodemon"."*" or []); + (self.nativeDeps."nodemon" or []); deps = [ + self.by-version."update-notifier"."0.1.7" ]; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.full."nodemon"."*"; - full."nomnom"."1.6.x" = lib.makeOverridable self.buildNodePackage { - name = "nomnom-1.6.1"; + "nodemon" = self.by-version."nodemon"."0.9.6"; + by-spec."nomnom"."1.6.x" = + self.by-version."nomnom"."1.6.2"; + by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "nomnom-1.6.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.1.tgz"; - sha1 = "bfed4506642d81278738e891c557e80694c1e0c9"; + url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; + sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; }) ]; buildInputs = - (self.nativeDeps."nomnom"."1.6.x" or []); + (self.nativeDeps."nomnom" or []); deps = [ - self.full."colors"."0.5.x" - self.full."underscore"."~1.4.4" + self.by-version."colors"."0.5.1" + self.by-version."underscore"."1.4.4" ]; peerDependencies = [ ]; passthru.names = [ "nomnom" ]; }; - full."nopt"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."nopt"."2" = + self.by-version."nopt"."2.1.2"; + by-version."nopt"."2.1.2" = lib.makeOverridable self.buildNodePackage { name = "nopt-2.1.2"; src = [ (fetchurl { @@ -9740,15 +7938,17 @@ }) ]; buildInputs = - (self.nativeDeps."nopt"."2" or []); + (self.nativeDeps."nopt" or []); deps = [ - self.full."abbrev"."1" + self.by-version."abbrev"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "nopt" ]; }; - full."nopt"."2.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."nopt"."2.0.0" = + self.by-version."nopt"."2.0.0"; + by-version."nopt"."2.0.0" = lib.makeOverridable self.buildNodePackage { name = "nopt-2.0.0"; src = [ (fetchurl { @@ -9757,32 +7957,19 @@ }) ]; buildInputs = - (self.nativeDeps."nopt"."2.0.0" or []); + (self.nativeDeps."nopt" or []); deps = [ - self.full."abbrev"."1" + self.by-version."abbrev"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "nopt" ]; }; - full."nopt"."2.1.x" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt"."2.1.x" or []); - deps = [ - self.full."abbrev"."1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - full."nopt"."~1.0.10" = lib.makeOverridable self.buildNodePackage { + by-spec."nopt"."2.1.x" = + self.by-version."nopt"."2.1.2"; + 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 { @@ -9791,182 +7978,105 @@ }) ]; buildInputs = - (self.nativeDeps."nopt"."~1.0.10" or []); + (self.nativeDeps."nopt" or []); deps = [ - self.full."abbrev"."1" + self.by-version."abbrev"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "nopt" ]; }; - full."nopt"."~2.1.1" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.1.2"; + 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."normalize-package-data"."~0.2.7" = + self.by-version."normalize-package-data"."0.2.7"; + by-version."normalize-package-data"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "normalize-package-data-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.7.tgz"; + sha1 = "0f075fa2d1f9ba23a854c4c56818c4077638f72a"; }) ]; buildInputs = - (self.nativeDeps."nopt"."~2.1.1" or []); + (self.nativeDeps."normalize-package-data" or []); deps = [ - self.full."abbrev"."1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - full."nopt"."~2.1.2" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; - sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt"."~2.1.2" or []); - deps = [ - self.full."abbrev"."1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - full."normalize-package-data"."~0.2" = lib.makeOverridable self.buildNodePackage { - name = "normalize-package-data-0.2.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.6.tgz"; - sha1 = "830bda1412f7ccae09b903fc080edbcdbb0947c0"; - }) - ]; - buildInputs = - (self.nativeDeps."normalize-package-data"."~0.2" or []); - deps = [ - self.full."semver"."2" - self.full."github-url-from-git"."~1.1.1" + self.by-version."semver"."2.2.1" + self.by-version."github-url-from-git"."1.1.1" + self.by-version."github-url-from-username-repo"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "normalize-package-data" ]; }; - full."npm"."*" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.11"; + by-spec."npm"."*" = + self.by-version."npm"."1.3.13"; + by-version."npm"."1.3.13" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.11.tgz"; - sha1 = "4bf7f005fe1038c4fe9207603b961c97bd0ba5a3"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.13.tgz"; + sha1 = "0662966d62cc92ae8875b122d4825714c781465a"; }) ]; buildInputs = - (self.nativeDeps."npm"."*" or []); + (self.nativeDeps."npm" or []); deps = [ - self.full."semver"."~2.1.0" - self.full."ini"."~1.1.0" - self.full."slide"."~1.1.5" - self.full."abbrev"."~1.0.4" - self.full."graceful-fs"."~2.0.0" - self.full."minimatch"."~0.2.12" - self.full."nopt"."~2.1.2" - self.full."rimraf"."~2.2.0" - self.full."request"."~2.27.0" - self.full."which"."1" - self.full."tar"."~0.1.18" - self.full."fstream"."~0.1.23" - self.full."block-stream"."0.0.7" - self.full."mkdirp"."~0.3.3" - self.full."read"."~1.0.4" - self.full."lru-cache"."~2.3.1" - self.full."node-gyp"."~0.10.10" - self.full."fstream-npm"."~0.1.3" - self.full."uid-number"."0" - self.full."archy"."0" - self.full."chownr"."0" - self.full."npmlog"."0.0.4" - self.full."ansi"."~0.1.2" - self.full."npm-registry-client"."~0.2.28" - self.full."read-package-json"."~1.1.3" - self.full."read-installed"."~0.2.2" - self.full."glob"."~3.2.6" - self.full."init-package-json"."0.0.11" - self.full."osenv"."0" - self.full."lockfile"."~0.4.0" - self.full."retry"."~0.6.0" - self.full."once"."~1.1.1" - self.full."npmconf"."~0.1.2" - self.full."opener"."~1.3.0" - self.full."chmodr"."~0.1.0" - self.full."cmd-shim"."~1.0.1" - self.full."sha"."~1.2.1" - self.full."editor"."0.0.4" - self.full."child-process-close"."~0.1.1" - self.full."npm-user-validate"."0.0.3" - self.full."github-url-from-git"."1.1.1" + 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.1" + self.by-version."minimatch"."0.2.12" + self.by-version."nopt"."2.1.2" + self.by-version."rimraf"."2.2.2" + self.by-version."request"."2.27.0" + self.by-version."which"."1.0.5" + self.by-version."tar"."0.1.18" + self.by-version."fstream"."0.1.24" + 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.3.1" + self.by-version."node-gyp"."0.11.0" + self.by-version."fstream-npm"."0.1.6" + self.by-version."uid-number"."0.0.3" + 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.2.29" + self.by-version."read-package-json"."1.1.4" + self.by-version."read-installed"."0.2.4" + self.by-version."glob"."3.2.6" + self.by-version."init-package-json"."0.0.11" + 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.5" + self.by-version."opener"."1.3.0" + self.by-version."chmodr"."0.1.0" + self.by-version."cmd-shim"."1.1.1" + self.by-version."sha"."1.2.3" + 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."github-url-from-git"."1.1.1" + self.by-version."github-url-from-username-repo"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "npm" ]; }; - "npm" = self.full."npm"."*"; - full."npm"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.1.tgz"; - sha1 = "c64f1c82362254cd4804a3dea5efbe6ec396460c"; - }) - ]; - buildInputs = - (self.nativeDeps."npm"."1.3.1" or []); - deps = [ - self.full."semver"."~2.0.8" - self.full."ini"."~1.1.0" - self.full."slide"."~1.1.4" - self.full."abbrev"."~1.0.4" - self.full."graceful-fs"."~1.2.2" - self.full."minimatch"."~0.2.12" - self.full."nopt"."~2.1.1" - self.full."rimraf"."~2.2.0" - self.full."request"."~2.21.0" - self.full."which"."1" - self.full."tar"."~0.1.17" - self.full."fstream"."~0.1.22" - self.full."block-stream"."*" - self.full."inherits"."1" - self.full."mkdirp"."~0.3.3" - self.full."read"."~1.0.4" - self.full."lru-cache"."~2.3.0" - self.full."node-gyp"."~0.10.2" - self.full."fstream-npm"."~0.1.3" - self.full."uid-number"."0" - self.full."archy"."0" - self.full."chownr"."0" - self.full."npmlog"."0.0.3" - self.full."ansi"."~0.1.2" - self.full."npm-registry-client"."~0.2.25" - self.full."read-package-json"."~1.1.0" - self.full."read-installed"."~0.2.2" - self.full."glob"."~3.2.1" - self.full."init-package-json"."0.0.10" - self.full."osenv"."0" - self.full."lockfile"."~0.3.2" - self.full."retry"."~0.6.0" - self.full."once"."~1.1.1" - self.full."npmconf"."~0.1.1" - self.full."opener"."~1.3.0" - self.full."chmodr"."~0.1.0" - self.full."cmd-shim"."~1.1.0" - self.full."sha"."~1.0.1" - self.full."editor"."0.0.4" - self.full."child-process-close"."~0.1.1" - self.full."npm-user-validate"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm" ]; - }; - full."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { + "npm" = self.by-version."npm"."1.3.13"; + by-spec."npm"."~1.3.13" = + self.by-version."npm"."1.3.13"; + by-spec."npm-registry-client"."0.2.27" = + self.by-version."npm-registry-client"."0.2.27"; + by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { name = "npm-registry-client-0.2.27"; src = [ (fetchurl { @@ -9975,76 +8085,54 @@ }) ]; buildInputs = - (self.nativeDeps."npm-registry-client"."0.2.27" or []); + (self.nativeDeps."npm-registry-client" or []); deps = [ - self.full."request"."2 >=2.20.0" - self.full."graceful-fs"."~2.0.0" - self.full."semver"."~2.0.5" - self.full."slide"."~1.1.3" - self.full."chownr"."0" - self.full."mkdirp"."~0.3.3" - self.full."rimraf"."~2" - self.full."retry"."0.6.0" - self.full."couch-login"."~0.1.15" - self.full."npmlog"."*" + self.by-version."request"."2.27.0" + self.by-version."graceful-fs"."2.0.1" + self.by-version."semver"."2.0.11" + self.by-version."slide"."1.1.5" + self.by-version."chownr"."0.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.2" + self.by-version."retry"."0.6.0" + self.by-version."couch-login"."0.1.18" + self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - full."npm-registry-client"."~0.2.25" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.28"; + by-spec."npm-registry-client"."~0.2.29" = + self.by-version."npm-registry-client"."0.2.29"; + by-version."npm-registry-client"."0.2.29" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-0.2.29"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz"; - sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.29.tgz"; + sha1 = "66ff2766f0c61d41e8a6139d3692d8833002c686"; }) ]; buildInputs = - (self.nativeDeps."npm-registry-client"."~0.2.25" or []); + (self.nativeDeps."npm-registry-client" or []); deps = [ - self.full."request"."2 >=2.25.0" - self.full."graceful-fs"."~2.0.0" - self.full."semver"."~2.1.0" - self.full."slide"."~1.1.3" - self.full."chownr"."0" - self.full."mkdirp"."~0.3.3" - self.full."rimraf"."~2" - self.full."retry"."0.6.0" - self.full."couch-login"."~0.1.18" - self.full."npmlog"."*" + self.by-version."request"."2.27.0" + self.by-version."graceful-fs"."2.0.1" + self.by-version."semver"."2.2.1" + self.by-version."slide"."1.1.5" + self.by-version."chownr"."0.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.2" + self.by-version."retry"."0.6.0" + self.by-version."couch-login"."0.1.18" + self.by-version."npmlog"."0.0.6" ]; peerDependencies = [ ]; passthru.names = [ "npm-registry-client" ]; }; - full."npm-registry-client"."~0.2.28" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.2.28"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz"; - sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client"."~0.2.28" or []); - deps = [ - self.full."request"."2 >=2.25.0" - self.full."graceful-fs"."~2.0.0" - self.full."semver"."~2.1.0" - self.full."slide"."~1.1.3" - self.full."chownr"."0" - self.full."mkdirp"."~0.3.3" - self.full."rimraf"."~2" - self.full."retry"."0.6.0" - self.full."couch-login"."~0.1.18" - self.full."npmlog"."*" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; - full."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."npm-user-validate"."0.0.3" = + self.by-version."npm-user-validate"."0.0.3"; + by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "npm-user-validate-0.0.3"; src = [ (fetchurl { @@ -10053,36 +8141,40 @@ }) ]; buildInputs = - (self.nativeDeps."npm-user-validate"."0.0.3" or []); + (self.nativeDeps."npm-user-validate" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "npm-user-validate" ]; }; - full."npm2nix"."*" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.1.0"; + by-spec."npm2nix"."*" = + self.by-version."npm2nix"."5.2.0"; + by-version."npm2nix"."5.2.0" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.1.0.tgz"; - sha1 = "a6b21174d57fdc31cf67849ffc72083bcae0e2ed"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.2.0.tgz"; + sha1 = "cce9016d598ad4fed4c98aa1830b40104214df4b"; }) ]; buildInputs = - (self.nativeDeps."npm2nix"."*" or []); + (self.nativeDeps."npm2nix" or []); deps = [ - self.full."semver".">=2.0.10 <3.0.0" - self.full."argparse"."0.1.15" - self.full."npm-registry-client"."0.2.27" - self.full."npmconf"."0.1.1" - self.full."tar"."0.1.17" + self.by-version."semver"."2.2.1" + self.by-version."argparse"."0.1.15" + self.by-version."npm-registry-client"."0.2.27" + self.by-version."npmconf"."0.1.1" + self.by-version."tar"."0.1.17" ]; peerDependencies = [ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.full."npm2nix"."*"; - full."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { + "npm2nix" = self.by-version."npm2nix"."5.2.0"; + by-spec."npmconf"."0.0.24" = + self.by-version."npmconf"."0.0.24"; + by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { name = "npmconf-0.0.24"; src = [ (fetchurl { @@ -10091,22 +8183,24 @@ }) ]; buildInputs = - (self.nativeDeps."npmconf"."0.0.24" or []); + (self.nativeDeps."npmconf" or []); deps = [ - self.full."config-chain"."~1.1.1" - self.full."inherits"."~1.0.0" - self.full."once"."~1.1.1" - self.full."mkdirp"."~0.3.3" - self.full."osenv"."0.0.3" - self.full."nopt"."2" - self.full."semver"."~1.1.0" - self.full."ini"."~1.1.0" + self.by-version."config-chain"."1.1.8" + self.by-version."inherits"."1.0.0" + self.by-version."once"."1.1.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."osenv"."0.0.3" + self.by-version."nopt"."2.1.2" + self.by-version."semver"."1.1.4" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - full."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."npmconf"."0.1.1" = + self.by-version."npmconf"."0.1.1"; + by-version."npmconf"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "npmconf-0.1.1"; src = [ (fetchurl { @@ -10115,138 +8209,75 @@ }) ]; buildInputs = - (self.nativeDeps."npmconf"."0.1.1" or []); + (self.nativeDeps."npmconf" or []); deps = [ - self.full."config-chain"."~1.1.1" - self.full."inherits"."~1.0.0" - self.full."once"."~1.1.1" - self.full."mkdirp"."~0.3.3" - self.full."osenv"."0.0.3" - self.full."nopt"."2" - self.full."semver"."2" - self.full."ini"."~1.1.0" + self.by-version."config-chain"."1.1.8" + self.by-version."inherits"."1.0.0" + self.by-version."once"."1.1.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."osenv"."0.0.3" + self.by-version."nopt"."2.1.2" + self.by-version."semver"."2.2.1" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - full."npmconf"."~0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.3"; + by-spec."npmconf"."~0.1.2" = + self.by-version."npmconf"."0.1.5"; + by-version."npmconf"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.3.tgz"; - sha1 = "e17832649a36785f086dac3d50705508e4f996e6"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.5.tgz"; + sha1 = "4201814e155df33a042a7f5405decb53447ae8cf"; }) ]; buildInputs = - (self.nativeDeps."npmconf"."~0.1.1" or []); + (self.nativeDeps."npmconf" or []); deps = [ - self.full."config-chain"."~1.1.1" - self.full."inherits"."~2.0.0" - self.full."once"."~1.1.1" - self.full."mkdirp"."~0.3.3" - self.full."osenv"."0.0.3" - self.full."nopt"."2" - self.full."semver"."2" - self.full."ini"."~1.1.0" + self.by-version."config-chain"."1.1.8" + self.by-version."inherits"."2.0.1" + self.by-version."once"."1.3.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."osenv"."0.0.3" + self.by-version."nopt"."2.1.2" + self.by-version."semver"."2.2.1" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - full."npmconf"."~0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-0.1.3"; + by-spec."npmconf"."~0.1.5" = + self.by-version."npmconf"."0.1.5"; + by-spec."npmlog"."*" = + self.by-version."npmlog"."0.0.6"; + by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "npmlog-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.3.tgz"; - sha1 = "e17832649a36785f086dac3d50705508e4f996e6"; + url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; + sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; }) ]; buildInputs = - (self.nativeDeps."npmconf"."~0.1.2" or []); + (self.nativeDeps."npmlog" or []); deps = [ - self.full."config-chain"."~1.1.1" - self.full."inherits"."~2.0.0" - self.full."once"."~1.1.1" - self.full."mkdirp"."~0.3.3" - self.full."osenv"."0.0.3" - self.full."nopt"."2" - self.full."semver"."2" - self.full."ini"."~1.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmconf" ]; - }; - full."npmlog"."*" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; - sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog"."*" or []); - deps = [ - self.full."ansi"."~0.1.2" + self.by-version."ansi"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "npmlog" ]; }; - full."npmlog"."0" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; - sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog"."0" or []); - deps = [ - self.full."ansi"."~0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; - full."npmlog"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.3.tgz"; - sha1 = "c424ad1531af402eef8da201fc3d63bdbd37dacb"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog"."0.0.3" or []); - deps = [ - self.full."ansi"."~0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; - full."npmlog"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; - sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog"."0.0.4" or []); - deps = [ - self.full."ansi"."~0.1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; - full."nssocket"."~0.5.1" = lib.makeOverridable self.buildNodePackage { + by-spec."npmlog"."0" = + self.by-version."npmlog"."0.0.6"; + by-spec."npmlog"."0.0.6" = + self.by-version."npmlog"."0.0.6"; + by-spec."nssocket"."~0.5.1" = + self.by-version."nssocket"."0.5.1"; + by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "nssocket-0.5.1"; src = [ (fetchurl { @@ -10255,16 +8286,18 @@ }) ]; buildInputs = - (self.nativeDeps."nssocket"."~0.5.1" or []); + (self.nativeDeps."nssocket" or []); deps = [ - self.full."eventemitter2"."~0.4.11" - self.full."lazy"."~1.0.11" + self.by-version."eventemitter2"."0.4.13" + self.by-version."lazy"."1.0.11" ]; peerDependencies = [ ]; passthru.names = [ "nssocket" ]; }; - full."oauth-sign"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."oauth-sign"."~0.2.0" = + self.by-version."oauth-sign"."0.2.0"; + by-version."oauth-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "oauth-sign-0.2.0"; src = [ (fetchurl { @@ -10273,14 +8306,16 @@ }) ]; buildInputs = - (self.nativeDeps."oauth-sign"."~0.2.0" or []); + (self.nativeDeps."oauth-sign" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "oauth-sign" ]; }; - full."oauth-sign"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "oauth-sign-0.3.0"; src = [ (fetchurl { @@ -10289,14 +8324,16 @@ }) ]; buildInputs = - (self.nativeDeps."oauth-sign"."~0.3.0" or []); + (self.nativeDeps."oauth-sign" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "oauth-sign" ]; }; - full."object-additions".">= 0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."object-additions".">= 0.5.0" = + self.by-version."object-additions"."0.5.1"; + by-version."object-additions"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "object-additions-0.5.1"; src = [ (fetchurl { @@ -10305,14 +8342,16 @@ }) ]; buildInputs = - (self.nativeDeps."object-additions".">= 0.5.0" or []); + (self.nativeDeps."object-additions" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "object-additions" ]; }; - full."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."once"."1.1.1" = + self.by-version."once"."1.1.1"; + by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "once-1.1.1"; src = [ (fetchurl { @@ -10321,30 +8360,36 @@ }) ]; buildInputs = - (self.nativeDeps."once"."1.1.1" or []); + (self.nativeDeps."once" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "once" ]; }; - full."once"."~1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "once-1.1.1"; + by-spec."once"."~1.1.1" = + self.by-version."once"."1.1.1"; + by-spec."once"."~1.3.0" = + self.by-version."once"."1.3.0"; + by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "once-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz"; + sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; }) ]; buildInputs = - (self.nativeDeps."once"."~1.1.1" or []); + (self.nativeDeps."once" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "once" ]; }; - full."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."open"."0.0.2" = + self.by-version."open"."0.0.2"; + by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "open-0.0.2"; src = [ (fetchurl { @@ -10353,14 +8398,16 @@ }) ]; buildInputs = - (self.nativeDeps."open"."0.0.2" or []); + (self.nativeDeps."open" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "open" ]; }; - full."open"."0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."open"."0.0.4" = + self.by-version."open"."0.0.4"; + by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "open-0.0.4"; src = [ (fetchurl { @@ -10369,30 +8416,18 @@ }) ]; buildInputs = - (self.nativeDeps."open"."0.0.4" or []); + (self.nativeDeps."open" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "open" ]; }; - full."open"."~0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "open-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz"; - sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262"; - }) - ]; - buildInputs = - (self.nativeDeps."open"."~0.0.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "open" ]; - }; - full."opener"."~1.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."open"."~0.0.3" = + self.by-version."open"."0.0.4"; + by-spec."opener"."~1.3.0" = + self.by-version."opener"."1.3.0"; + by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { name = "opener-1.3.0"; src = [ (fetchurl { @@ -10401,14 +8436,16 @@ }) ]; buildInputs = - (self.nativeDeps."opener"."~1.3.0" or []); + (self.nativeDeps."opener" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "opener" ]; }; - full."optimist"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."optimist"."*" = + self.by-version."optimist"."0.6.0"; + by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.6.0"; src = [ (fetchurl { @@ -10417,17 +8454,19 @@ }) ]; buildInputs = - (self.nativeDeps."optimist"."*" or []); + (self.nativeDeps."optimist" or []); deps = [ - self.full."wordwrap"."~0.0.2" - self.full."minimist"."~0.0.1" + self.by-version."wordwrap"."0.0.2" + self.by-version."minimist"."0.0.5" ]; peerDependencies = [ ]; passthru.names = [ "optimist" ]; }; - "optimist" = self.full."optimist"."*"; - full."optimist"."0.2" = lib.makeOverridable self.buildNodePackage { + "optimist" = self.by-version."optimist"."0.6.0"; + by-spec."optimist"."0.2" = + self.by-version."optimist"."0.2.8"; + by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.2.8"; src = [ (fetchurl { @@ -10436,15 +8475,17 @@ }) ]; buildInputs = - (self.nativeDeps."optimist"."0.2" or []); + (self.nativeDeps."optimist" or []); deps = [ - self.full."wordwrap".">=0.0.1 <0.1.0" + self.by-version."wordwrap"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "optimist" ]; }; - full."optimist"."0.3.5" = lib.makeOverridable self.buildNodePackage { + by-spec."optimist"."0.3.5" = + self.by-version."optimist"."0.3.5"; + by-version."optimist"."0.3.5" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.3.5"; src = [ (fetchurl { @@ -10453,15 +8494,17 @@ }) ]; buildInputs = - (self.nativeDeps."optimist"."0.3.5" or []); + (self.nativeDeps."optimist" or []); deps = [ - self.full."wordwrap"."~0.0.2" + self.by-version."wordwrap"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "optimist" ]; }; - full."optimist"."0.3.x" = lib.makeOverridable self.buildNodePackage { + by-spec."optimist"."0.3.x" = + self.by-version."optimist"."0.3.7"; + by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.3.7"; src = [ (fetchurl { @@ -10470,15 +8513,17 @@ }) ]; buildInputs = - (self.nativeDeps."optimist"."0.3.x" or []); + (self.nativeDeps."optimist" or []); deps = [ - self.full."wordwrap"."~0.0.2" + self.by-version."wordwrap"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "optimist" ]; }; - full."optimist"."0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."optimist"."0.4.0" = + self.by-version."optimist"."0.4.0"; + by-version."optimist"."0.4.0" = lib.makeOverridable self.buildNodePackage { name = "optimist-0.4.0"; src = [ (fetchurl { @@ -10487,102 +8532,27 @@ }) ]; buildInputs = - (self.nativeDeps."optimist"."0.4.0" or []); + (self.nativeDeps."optimist" or []); deps = [ - self.full."wordwrap"."~0.0.2" + self.by-version."wordwrap"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "optimist" ]; }; - full."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist"."0.6.0" or []); - deps = [ - self.full."wordwrap"."~0.0.2" - self.full."minimist"."~0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - full."optimist"."~0.3" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist"."~0.3" or []); - deps = [ - self.full."wordwrap"."~0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - full."optimist"."~0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist"."~0.3.4" or []); - deps = [ - self.full."wordwrap"."~0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - full."optimist"."~0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.3.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist"."~0.3.5" or []); - deps = [ - self.full."wordwrap"."~0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - full."optimist"."~0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist"."~0.6.0" or []); - deps = [ - self.full."wordwrap"."~0.0.2" - self.full."minimist"."~0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - full."options".">=0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."optimist"."0.6.0" = + self.by-version."optimist"."0.6.0"; + by-spec."optimist"."~0.3" = + self.by-version."optimist"."0.3.7"; + by-spec."optimist"."~0.3.4" = + self.by-version."optimist"."0.3.7"; + by-spec."optimist"."~0.3.5" = + self.by-version."optimist"."0.3.7"; + by-spec."optimist"."~0.6.0" = + self.by-version."optimist"."0.6.0"; + by-spec."options".">=0.0.5" = + self.by-version."options"."0.0.5"; + by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "options-0.0.5"; src = [ (fetchurl { @@ -10591,14 +8561,16 @@ }) ]; buildInputs = - (self.nativeDeps."options".">=0.0.5" or []); + (self.nativeDeps."options" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "options" ]; }; - full."optparse"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."optparse"."*" = + self.by-version."optparse"."1.0.4"; + by-version."optparse"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "optparse-1.0.4"; src = [ (fetchurl { @@ -10607,31 +8579,19 @@ }) ]; buildInputs = - (self.nativeDeps."optparse"."*" or []); + (self.nativeDeps."optparse" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "optparse" ]; }; - "optparse" = self.full."optparse"."*"; - full."optparse".">= 1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "optparse-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz"; - sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1"; - }) - ]; - buildInputs = - (self.nativeDeps."optparse".">= 1.0.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "optparse" ]; - }; - full."osenv"."0" = lib.makeOverridable self.buildNodePackage { + "optparse" = self.by-version."optparse"."1.0.4"; + by-spec."optparse".">= 1.0.3" = + self.by-version."optparse"."1.0.4"; + by-spec."osenv"."0" = + self.by-version."osenv"."0.0.3"; + by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "osenv-0.0.3"; src = [ (fetchurl { @@ -10640,30 +8600,18 @@ }) ]; buildInputs = - (self.nativeDeps."osenv"."0" or []); + (self.nativeDeps."osenv" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "osenv" ]; }; - full."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "osenv-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }) - ]; - buildInputs = - (self.nativeDeps."osenv"."0.0.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "osenv" ]; - }; - full."over"."~0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."osenv"."0.0.3" = + self.by-version."osenv"."0.0.3"; + by-spec."over"."~0.0.5" = + self.by-version."over"."0.0.5"; + by-version."over"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "over-0.0.5"; src = [ (fetchurl { @@ -10672,14 +8620,16 @@ }) ]; buildInputs = - (self.nativeDeps."over"."~0.0.5" or []); + (self.nativeDeps."over" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "over" ]; }; - full."owl-deepcopy"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."owl-deepcopy"."*" = + self.by-version."owl-deepcopy"."0.0.2"; + by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "owl-deepcopy-0.0.2"; src = [ (fetchurl { @@ -10688,31 +8638,19 @@ }) ]; buildInputs = - (self.nativeDeps."owl-deepcopy"."*" or []); + (self.nativeDeps."owl-deepcopy" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "owl-deepcopy" ]; }; - "owl-deepcopy" = self.full."owl-deepcopy"."*"; - full."owl-deepcopy"."~0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "owl-deepcopy-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; - sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88"; - }) - ]; - buildInputs = - (self.nativeDeps."owl-deepcopy"."~0.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "owl-deepcopy" ]; - }; - full."passport"."*" = lib.makeOverridable self.buildNodePackage { + "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.2"; + by-spec."owl-deepcopy"."~0.0.1" = + self.by-version."owl-deepcopy"."0.0.2"; + by-spec."passport"."*" = + self.by-version."passport"."0.1.17"; + by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { name = "passport-0.1.17"; src = [ (fetchurl { @@ -10721,71 +8659,25 @@ }) ]; buildInputs = - (self.nativeDeps."passport"."*" or []); + (self.nativeDeps."passport" or []); deps = [ - self.full."pkginfo"."0.2.x" - self.full."pause"."0.0.1" + self.by-version."pkginfo"."0.2.3" + self.by-version."pause"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "passport" ]; }; - "passport" = self.full."passport"."*"; - full."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "passport-0.1.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; - sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; - }) - ]; - buildInputs = - (self.nativeDeps."passport"."0.1.17" or []); - deps = [ - self.full."pkginfo"."0.2.x" - self.full."pause"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport" ]; - }; - full."passport"."~0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "passport-0.1.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; - sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; - }) - ]; - buildInputs = - (self.nativeDeps."passport"."~0.1.1" or []); - deps = [ - self.full."pkginfo"."0.2.x" - self.full."pause"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport" ]; - }; - full."passport"."~0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "passport-0.1.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; - sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; - }) - ]; - buildInputs = - (self.nativeDeps."passport"."~0.1.3" or []); - deps = [ - self.full."pkginfo"."0.2.x" - self.full."pause"."0.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport" ]; - }; - full."passport-http"."*" = lib.makeOverridable self.buildNodePackage { + "passport" = self.by-version."passport"."0.1.17"; + by-spec."passport"."0.1.17" = + self.by-version."passport"."0.1.17"; + by-spec."passport"."~0.1.1" = + self.by-version."passport"."0.1.17"; + by-spec."passport"."~0.1.3" = + self.by-version."passport"."0.1.17"; + by-spec."passport-http"."*" = + self.by-version."passport-http"."0.2.2"; + by-version."passport-http"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "passport-http-0.2.2"; src = [ (fetchurl { @@ -10794,17 +8686,19 @@ }) ]; buildInputs = - (self.nativeDeps."passport-http"."*" or []); + (self.nativeDeps."passport-http" or []); deps = [ - self.full."pkginfo"."0.2.x" - self.full."passport"."~0.1.3" + self.by-version."pkginfo"."0.2.3" + self.by-version."passport"."0.1.17" ]; peerDependencies = [ ]; passthru.names = [ "passport-http" ]; }; - "passport-http" = self.full."passport-http"."*"; - full."passport-local"."*" = lib.makeOverridable self.buildNodePackage { + "passport-http" = self.by-version."passport-http"."0.2.2"; + by-spec."passport-local"."*" = + self.by-version."passport-local"."0.1.6"; + by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "passport-local-0.1.6"; src = [ (fetchurl { @@ -10813,35 +8707,21 @@ }) ]; buildInputs = - (self.nativeDeps."passport-local"."*" or []); + (self.nativeDeps."passport-local" or []); deps = [ - self.full."pkginfo"."0.2.x" - self.full."passport"."~0.1.1" + self.by-version."pkginfo"."0.2.3" + self.by-version."passport"."0.1.17" ]; peerDependencies = [ ]; passthru.names = [ "passport-local" ]; }; - "passport-local" = self.full."passport-local"."*"; - full."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "passport-local-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; - sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; - }) - ]; - buildInputs = - (self.nativeDeps."passport-local"."0.1.6" or []); - deps = [ - self.full."pkginfo"."0.2.x" - self.full."passport"."~0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "passport-local" ]; - }; - full."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { + "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."pause"."0.0.1" = + self.by-version."pause"."0.0.1"; + by-version."pause"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "pause-0.0.1"; src = [ (fetchurl { @@ -10850,14 +8730,16 @@ }) ]; buildInputs = - (self.nativeDeps."pause"."0.0.1" or []); + (self.nativeDeps."pause" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "pause" ]; }; - full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage { + by-spec."phantomjs"."~1.9" = + self.by-version."phantomjs"."1.9.2-2"; + by-version."phantomjs"."1.9.2-2" = lib.makeOverridable self.buildNodePackage { name = "phantomjs-1.9.2-2"; src = [ (fetchurl { @@ -10866,44 +8748,25 @@ }) ]; buildInputs = - (self.nativeDeps."phantomjs"."~1.9" or []); + (self.nativeDeps."phantomjs" or []); deps = [ - self.full."adm-zip"."0.2.1" - self.full."kew"."~0.1.7" - self.full."ncp"."0.4.2" - self.full."npmconf"."0.0.24" - self.full."mkdirp"."0.3.5" - self.full."rimraf"."~2.0.2" - self.full."which"."~1.0.5" + self.by-version."adm-zip"."0.2.1" + self.by-version."kew"."0.1.7" + self.by-version."ncp"."0.4.2" + self.by-version."npmconf"."0.0.24" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.0.3" + self.by-version."which"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "phantomjs" ]; }; - full."phantomjs"."~1.9.1-2" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.2-2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-2.tgz"; - sha1 = "256228800bc18292395eb0f54b14cd42c8093889"; - }) - ]; - buildInputs = - (self.nativeDeps."phantomjs"."~1.9.1-2" or []); - deps = [ - self.full."adm-zip"."0.2.1" - self.full."kew"."~0.1.7" - self.full."ncp"."0.4.2" - self.full."npmconf"."0.0.24" - self.full."mkdirp"."0.3.5" - self.full."rimraf"."~2.0.2" - self.full."which"."~1.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "phantomjs" ]; - }; - full."pkginfo"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."phantomjs"."~1.9.1-2" = + self.by-version."phantomjs"."1.9.2-2"; + by-spec."pkginfo"."0.2.x" = + self.by-version."pkginfo"."0.2.3"; + by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { name = "pkginfo-0.2.3"; src = [ (fetchurl { @@ -10912,14 +8775,16 @@ }) ]; buildInputs = - (self.nativeDeps."pkginfo"."0.2.x" or []); + (self.nativeDeps."pkginfo" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "pkginfo" ]; }; - full."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."pkginfo"."0.3.0" = + self.by-version."pkginfo"."0.3.0"; + by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "pkginfo-0.3.0"; src = [ (fetchurl { @@ -10928,46 +8793,20 @@ }) ]; buildInputs = - (self.nativeDeps."pkginfo"."0.3.0" or []); + (self.nativeDeps."pkginfo" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "pkginfo" ]; }; - full."pkginfo"."0.3.x" = lib.makeOverridable self.buildNodePackage { - name = "pkginfo-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; - }) - ]; - buildInputs = - (self.nativeDeps."pkginfo"."0.3.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "pkginfo" ]; - }; - full."pkginfo"."0.x.x" = lib.makeOverridable self.buildNodePackage { - name = "pkginfo-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; - }) - ]; - buildInputs = - (self.nativeDeps."pkginfo"."0.x.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "pkginfo" ]; - }; - full."plist-native"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."pkginfo"."0.3.x" = + self.by-version."pkginfo"."0.3.0"; + by-spec."pkginfo"."0.x.x" = + self.by-version."pkginfo"."0.3.0"; + by-spec."plist-native"."*" = + self.by-version."plist-native"."0.2.2"; + by-version."plist-native"."0.2.2" = lib.makeOverridable self.buildNodePackage { name = "plist-native-0.2.2"; src = [ (fetchurl { @@ -10976,16 +8815,18 @@ }) ]; buildInputs = - (self.nativeDeps."plist-native"."*" or []); + (self.nativeDeps."plist-native" or []); deps = [ - self.full."libxmljs"."~0.8.1" + self.by-version."libxmljs"."0.8.1" ]; peerDependencies = [ ]; passthru.names = [ "plist-native" ]; }; - "plist-native" = self.full."plist-native"."*"; - full."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { + "plist-native" = self.by-version."plist-native"."0.2.2"; + by-spec."policyfile"."0.0.4" = + self.by-version."policyfile"."0.0.4"; + by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "policyfile-0.0.4"; src = [ (fetchurl { @@ -10994,14 +8835,16 @@ }) ]; buildInputs = - (self.nativeDeps."policyfile"."0.0.4" or []); + (self.nativeDeps."policyfile" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "policyfile" ]; }; - full."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."posix-getopt"."1.0.0" = + self.by-version."posix-getopt"."1.0.0"; + by-version."posix-getopt"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "posix-getopt-1.0.0"; src = [ (fetchurl { @@ -11010,14 +8853,16 @@ }) ]; buildInputs = - (self.nativeDeps."posix-getopt"."1.0.0" or []); + (self.nativeDeps."posix-getopt" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "posix-getopt" ]; }; - full."promise"."~2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."promise"."~2.0" = + self.by-version."promise"."2.0.0"; + by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage { name = "promise-2.0.0"; src = [ (fetchurl { @@ -11026,15 +8871,17 @@ }) ]; buildInputs = - (self.nativeDeps."promise"."~2.0" or []); + (self.nativeDeps."promise" or []); deps = [ - self.full."is-promise"."~1" + self.by-version."is-promise"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "promise" ]; }; - full."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage { + by-spec."prompt"."0.2.11" = + self.by-version."prompt"."0.2.11"; + by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage { name = "prompt-0.2.11"; src = [ (fetchurl { @@ -11043,19 +8890,21 @@ }) ]; buildInputs = - (self.nativeDeps."prompt"."0.2.11" or []); + (self.nativeDeps."prompt" or []); deps = [ - self.full."pkginfo"."0.x.x" - self.full."read"."1.0.x" - self.full."revalidator"."0.1.x" - self.full."utile"."0.2.x" - self.full."winston"."0.6.x" + self.by-version."pkginfo"."0.3.0" + self.by-version."read"."1.0.5" + self.by-version."revalidator"."0.1.5" + self.by-version."utile"."0.2.0" + self.by-version."winston"."0.6.2" ]; peerDependencies = [ ]; passthru.names = [ "prompt" ]; }; - full."prompt"."0.2.9" = lib.makeOverridable self.buildNodePackage { + by-spec."prompt"."0.2.9" = + self.by-version."prompt"."0.2.9"; + by-version."prompt"."0.2.9" = lib.makeOverridable self.buildNodePackage { name = "prompt-0.2.9"; src = [ (fetchurl { @@ -11064,19 +8913,21 @@ }) ]; buildInputs = - (self.nativeDeps."prompt"."0.2.9" or []); + (self.nativeDeps."prompt" or []); deps = [ - self.full."pkginfo"."0.x.x" - self.full."read"."1.0.x" - self.full."revalidator"."0.1.x" - self.full."utile"."0.1.x" - self.full."winston"."0.6.x" + self.by-version."pkginfo"."0.3.0" + self.by-version."read"."1.0.5" + self.by-version."revalidator"."0.1.5" + self.by-version."utile"."0.1.7" + self.by-version."winston"."0.6.2" ]; peerDependencies = [ ]; passthru.names = [ "prompt" ]; }; - full."promptly"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."promptly"."~0.2.0" = + self.by-version."promptly"."0.2.0"; + by-version."promptly"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "promptly-0.2.0"; src = [ (fetchurl { @@ -11085,15 +8936,17 @@ }) ]; buildInputs = - (self.nativeDeps."promptly"."~0.2.0" or []); + (self.nativeDeps."promptly" or []); deps = [ - self.full."read"."~1.0.4" + self.by-version."read"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "promptly" ]; }; - full."promzard"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."promzard"."~0.2.0" = + self.by-version."promzard"."0.2.0"; + by-version."promzard"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "promzard-0.2.0"; src = [ (fetchurl { @@ -11102,15 +8955,17 @@ }) ]; buildInputs = - (self.nativeDeps."promzard"."~0.2.0" or []); + (self.nativeDeps."promzard" or []); deps = [ - self.full."read"."1" + self.by-version."read"."1.0.5" ]; peerDependencies = [ ]; passthru.names = [ "promzard" ]; }; - full."proto-list"."~1.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."proto-list"."~1.2.1" = + self.by-version."proto-list"."1.2.2"; + by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage { name = "proto-list-1.2.2"; src = [ (fetchurl { @@ -11119,14 +8974,16 @@ }) ]; buildInputs = - (self.nativeDeps."proto-list"."~1.2.1" or []); + (self.nativeDeps."proto-list" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "proto-list" ]; }; - full."ps-tree"."0.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."ps-tree"."0.0.x" = + self.by-version."ps-tree"."0.0.3"; + by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "ps-tree-0.0.3"; src = [ (fetchurl { @@ -11135,15 +8992,17 @@ }) ]; buildInputs = - (self.nativeDeps."ps-tree"."0.0.x" or []); + (self.nativeDeps."ps-tree" or []); deps = [ - self.full."event-stream"."~0.5" + self.by-version."event-stream"."0.5.3" ]; peerDependencies = [ ]; passthru.names = [ "ps-tree" ]; }; - full."pullstream"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."pullstream"."~0.4.0" = + self.by-version."pullstream"."0.4.0"; + by-version."pullstream"."0.4.0" = lib.makeOverridable self.buildNodePackage { name = "pullstream-0.4.0"; src = [ (fetchurl { @@ -11152,18 +9011,20 @@ }) ]; buildInputs = - (self.nativeDeps."pullstream"."~0.4.0" or []); + (self.nativeDeps."pullstream" or []); deps = [ - self.full."over"."~0.0.5" - self.full."readable-stream"."~1.0.0" - self.full."setimmediate"."~1.0.1" - self.full."slice-stream"."0.0.0" + self.by-version."over"."0.0.5" + self.by-version."readable-stream"."1.0.17" + self.by-version."setimmediate"."1.0.1" + self.by-version."slice-stream"."0.0.0" ]; peerDependencies = [ ]; passthru.names = [ "pullstream" ]; }; - full."q"."0.9.x" = lib.makeOverridable self.buildNodePackage { + by-spec."q"."0.9.x" = + self.by-version."q"."0.9.7"; + by-version."q"."0.9.7" = lib.makeOverridable self.buildNodePackage { name = "q-0.9.7"; src = [ (fetchurl { @@ -11172,78 +9033,24 @@ }) ]; buildInputs = - (self.nativeDeps."q"."0.9.x" or []); + (self.nativeDeps."q" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "q" ]; }; - full."q".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }) - ]; - buildInputs = - (self.nativeDeps."q".">= 0.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "q" ]; - }; - full."q"."~0.9" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }) - ]; - buildInputs = - (self.nativeDeps."q"."~0.9" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "q" ]; - }; - full."q"."~0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }) - ]; - buildInputs = - (self.nativeDeps."q"."~0.9.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "q" ]; - }; - full."q"."~0.9.6" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }) - ]; - buildInputs = - (self.nativeDeps."q"."~0.9.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "q" ]; - }; - full."qs"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."q".">= 0.0.1" = + self.by-version."q"."0.9.7"; + by-spec."q"."~0.9" = + self.by-version."q"."0.9.7"; + by-spec."q"."~0.9.2" = + self.by-version."q"."0.9.7"; + by-spec."q"."~0.9.6" = + self.by-version."q"."0.9.7"; + by-spec."qs"."0.4.x" = + self.by-version."qs"."0.4.2"; + by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "qs-0.4.2"; src = [ (fetchurl { @@ -11252,14 +9059,16 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."0.4.x" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage { + by-spec."qs"."0.5.1" = + self.by-version."qs"."0.5.1"; + by-version."qs"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.1"; src = [ (fetchurl { @@ -11268,14 +9077,16 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."0.5.1" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage { + by-spec."qs"."0.5.2" = + self.by-version."qs"."0.5.2"; + by-version."qs"."0.5.2" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.2"; src = [ (fetchurl { @@ -11284,14 +9095,16 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."0.5.2" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage { + by-spec."qs"."0.5.5" = + self.by-version."qs"."0.5.5"; + by-version."qs"."0.5.5" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.5"; src = [ (fetchurl { @@ -11300,14 +9113,16 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."0.5.5" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage { + by-spec."qs"."0.6.5" = + self.by-version."qs"."0.6.5"; + by-version."qs"."0.6.5" = lib.makeOverridable self.buildNodePackage { name = "qs-0.6.5"; src = [ (fetchurl { @@ -11316,30 +9131,18 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."0.6.5" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs".">= 0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; - sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; - }) - ]; - buildInputs = - (self.nativeDeps."qs".">= 0.4.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - full."qs"."~0.5.0" = lib.makeOverridable self.buildNodePackage { + by-spec."qs".">= 0.4.0" = + self.by-version."qs"."0.6.5"; + by-spec."qs"."~0.5.0" = + self.by-version."qs"."0.5.6"; + by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { name = "qs-0.5.6"; src = [ (fetchurl { @@ -11348,46 +9151,20 @@ }) ]; buildInputs = - (self.nativeDeps."qs"."~0.5.0" or []); + (self.nativeDeps."qs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "qs" ]; }; - full."qs"."~0.5.4" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.5.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; - sha1 = "31b1ad058567651c526921506b9a8793911a0384"; - }) - ]; - buildInputs = - (self.nativeDeps."qs"."~0.5.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - full."qs"."~0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; - sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; - }) - ]; - buildInputs = - (self.nativeDeps."qs"."~0.6.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - full."rai"."~0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."qs"."~0.5.4" = + self.by-version."qs"."0.5.6"; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.5"; + by-spec."rai"."~0.1" = + self.by-version."rai"."0.1.7"; + by-version."rai"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "rai-0.1.7"; src = [ (fetchurl { @@ -11396,14 +9173,16 @@ }) ]; buildInputs = - (self.nativeDeps."rai"."~0.1" or []); + (self.nativeDeps."rai" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "rai" ]; }; - full."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."range-parser"."0.0.4" = + self.by-version."range-parser"."0.0.4"; + by-version."range-parser"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "range-parser-0.0.4"; src = [ (fetchurl { @@ -11412,14 +9191,54 @@ }) ]; buildInputs = - (self.nativeDeps."range-parser"."0.0.4" or []); + (self.nativeDeps."range-parser" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "range-parser" ]; }; - full."raw-socket"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."raven"."~0.5.4" = + self.by-version."raven"."0.5.4"; + by-version."raven"."0.5.4" = lib.makeOverridable self.buildNodePackage { + name = "raven-0.5.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raven/-/raven-0.5.4.tgz"; + sha1 = "98cfd26d07dcb87d56d8236ffdb2675b9ca93754"; + }) + ]; + buildInputs = + (self.nativeDeps."raven" or []); + deps = [ + self.by-version."node-uuid"."1.4.0" + self.by-version."raw-stacktrace"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raven" ]; + }; + by-spec."raw-body"."0.0.3" = + self.by-version."raw-body"."0.0.3"; + by-version."raw-body"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = [ + ]; + 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 { name = "raw-socket-1.2.2"; src = [ (fetchurl { @@ -11428,14 +9247,36 @@ }) ]; buildInputs = - (self.nativeDeps."raw-socket"."*" or []); + (self.nativeDeps."raw-socket" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "raw-socket" ]; }; - full."rbytes"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."raw-stacktrace"."1.0.0" = + self.by-version."raw-stacktrace"."1.0.0"; + by-version."raw-stacktrace"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "raw-stacktrace-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-stacktrace/-/raw-stacktrace-1.0.0.tgz"; + sha1 = "f308881f17667785a9acd7c8fbd442e1b2acf1db"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-stacktrace" or []); + deps = [ + self.by-version."traceback"."0.3.0" + self.by-version."underscore"."1.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-stacktrace" ]; + }; + by-spec."rbytes"."*" = + self.by-version."rbytes"."1.0.0"; + by-version."rbytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "rbytes-1.0.0"; src = [ (fetchurl { @@ -11444,34 +9285,17 @@ }) ]; buildInputs = - (self.nativeDeps."rbytes"."*" or []); + (self.nativeDeps."rbytes" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "rbytes" ]; }; - "rbytes" = self.full."rbytes"."*"; - full."rc"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.0.tgz"; - sha1 = "caffdaafc17e8608e50db0c6ee63f1c344d9ac58"; - }) - ]; - buildInputs = - (self.nativeDeps."rc"."0.3.0" or []); - deps = [ - self.full."optimist"."~0.3.4" - self.full."deep-extend"."~0.2.5" - self.full."ini"."~1.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "rc" ]; - }; - full."rc"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + "rbytes" = self.by-version."rbytes"."1.0.0"; + by-spec."rc"."~0.3.0" = + self.by-version."rc"."0.3.1"; + by-version."rc"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "rc-0.3.1"; src = [ (fetchurl { @@ -11480,17 +9304,21 @@ }) ]; buildInputs = - (self.nativeDeps."rc"."~0.3.0" or []); + (self.nativeDeps."rc" or []); deps = [ - self.full."optimist"."~0.3.4" - self.full."deep-extend"."~0.2.5" - self.full."ini"."~1.1.0" + self.by-version."optimist"."0.3.7" + self.by-version."deep-extend"."0.2.6" + self.by-version."ini"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "rc" ]; }; - full."read"."1" = lib.makeOverridable self.buildNodePackage { + by-spec."rc"."~0.3.1" = + self.by-version."rc"."0.3.1"; + by-spec."read"."1" = + self.by-version."read"."1.0.5"; + by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { name = "read-1.0.5"; src = [ (fetchurl { @@ -11499,66 +9327,23 @@ }) ]; buildInputs = - (self.nativeDeps."read"."1" or []); + (self.nativeDeps."read" or []); deps = [ - self.full."mute-stream"."~0.0.4" + self.by-version."mute-stream"."0.0.4" ]; peerDependencies = [ ]; passthru.names = [ "read" ]; }; - full."read"."1.0.x" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read"."1.0.x" or []); - deps = [ - self.full."mute-stream"."~0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - full."read"."~1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read"."~1.0.1" or []); - deps = [ - self.full."mute-stream"."~0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - full."read"."~1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read"."~1.0.4" or []); - deps = [ - self.full."mute-stream"."~0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - full."read-installed"."~0.2.2" = lib.makeOverridable self.buildNodePackage { + by-spec."read"."1.0.x" = + self.by-version."read"."1.0.5"; + by-spec."read"."~1.0.1" = + self.by-version."read"."1.0.5"; + by-spec."read"."~1.0.4" = + self.by-version."read"."1.0.5"; + by-spec."read-installed"."~0.2.2" = + self.by-version."read-installed"."0.2.4"; + by-version."read-installed"."0.2.4" = lib.makeOverridable self.buildNodePackage { name = "read-installed-0.2.4"; src = [ (fetchurl { @@ -11567,78 +9352,44 @@ }) ]; buildInputs = - (self.nativeDeps."read-installed"."~0.2.2" or []); + (self.nativeDeps."read-installed" or []); deps = [ - self.full."semver"."2" - self.full."slide"."~1.1.3" - self.full."read-package-json"."1" - self.full."graceful-fs"."~2" + self.by-version."semver"."2.2.1" + self.by-version."slide"."1.1.5" + self.by-version."read-package-json"."1.1.4" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "read-installed" ]; }; - full."read-package-json"."1" = lib.makeOverridable self.buildNodePackage { - name = "read-package-json-1.1.3"; + by-spec."read-package-json"."1" = + self.by-version."read-package-json"."1.1.4"; + by-version."read-package-json"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "read-package-json-1.1.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz"; - sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391"; + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.4.tgz"; + sha1 = "c4effa9fac527deaee1cd84659c419693aa5294a"; }) ]; buildInputs = - (self.nativeDeps."read-package-json"."1" or []); + (self.nativeDeps."read-package-json" or []); deps = [ - self.full."glob"."~3.2.1" - self.full."lru-cache"."2" - self.full."normalize-package-data"."~0.2" - self.full."graceful-fs"."2" + self.by-version."glob"."3.2.6" + self.by-version."lru-cache"."2.3.1" + self.by-version."normalize-package-data"."0.2.7" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "read-package-json" ]; }; - full."read-package-json"."~1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "read-package-json-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz"; - sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391"; - }) - ]; - buildInputs = - (self.nativeDeps."read-package-json"."~1.1.0" or []); - deps = [ - self.full."glob"."~3.2.1" - self.full."lru-cache"."2" - self.full."normalize-package-data"."~0.2" - self.full."graceful-fs"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read-package-json" ]; - }; - full."read-package-json"."~1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "read-package-json-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz"; - sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391"; - }) - ]; - buildInputs = - (self.nativeDeps."read-package-json"."~1.1.3" or []); - deps = [ - self.full."glob"."~3.2.1" - self.full."lru-cache"."2" - self.full."normalize-package-data"."~0.2" - self.full."graceful-fs"."2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read-package-json" ]; - }; - full."readable-stream"."1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."read-package-json"."~1.1.4" = + self.by-version."read-package-json"."1.1.4"; + by-spec."readable-stream"."1.0" = + self.by-version."readable-stream"."1.0.17"; + by-version."readable-stream"."1.0.17" = lib.makeOverridable self.buildNodePackage { name = "readable-stream-1.0.17"; src = [ (fetchurl { @@ -11647,46 +9398,20 @@ }) ]; buildInputs = - (self.nativeDeps."readable-stream"."1.0" or []); + (self.nativeDeps."readable-stream" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "readable-stream" ]; }; - full."readable-stream"."~1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz"; - sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream"."~1.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; - full."readable-stream"."~1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.17"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.17.tgz"; - sha1 = "cbc295fdf394dfa1225d225d02e6b6d0f409fd4b"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream"."~1.0.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; - full."readable-stream"."~1.1.8" = lib.makeOverridable self.buildNodePackage { + by-spec."readable-stream"."~1.0.0" = + self.by-version."readable-stream"."1.0.17"; + by-spec."readable-stream"."~1.0.2" = + self.by-version."readable-stream"."1.0.17"; + by-spec."readable-stream"."~1.1.8" = + self.by-version."readable-stream"."1.1.9"; + by-version."readable-stream"."1.1.9" = lib.makeOverridable self.buildNodePackage { name = "readable-stream-1.1.9"; src = [ (fetchurl { @@ -11695,34 +9420,20 @@ }) ]; buildInputs = - (self.nativeDeps."readable-stream"."~1.1.8" or []); + (self.nativeDeps."readable-stream" or []); deps = [ - self.full."core-util-is"."~1.0.0" - self.full."debuglog"."0.0.2" + self.by-version."core-util-is"."1.0.0" + self.by-version."debuglog"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "readable-stream" ]; }; - full."readable-stream"."~1.1.9" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz"; - sha1 = "d87130fbf8f9ee9c3b4058b3c58a3e30db2fcfdd"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream"."~1.1.9" or []); - deps = [ - self.full."core-util-is"."~1.0.0" - self.full."debuglog"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; - full."readdirp"."~0.2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."readable-stream"."~1.1.9" = + self.by-version."readable-stream"."1.1.9"; + by-spec."readdirp"."~0.2.3" = + self.by-version."readdirp"."0.2.5"; + by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage { name = "readdirp-0.2.5"; src = [ (fetchurl { @@ -11731,15 +9442,17 @@ }) ]; buildInputs = - (self.nativeDeps."readdirp"."~0.2.3" or []); + (self.nativeDeps."readdirp" or []); deps = [ - self.full."minimatch".">=0.2.4" + self.by-version."minimatch"."0.2.12" ]; peerDependencies = [ ]; passthru.names = [ "readdirp" ]; }; - full."redeyed"."~0.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."redeyed"."~0.4.0" = + self.by-version."redeyed"."0.4.2"; + by-version."redeyed"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "redeyed-0.4.2"; src = [ (fetchurl { @@ -11748,15 +9461,17 @@ }) ]; buildInputs = - (self.nativeDeps."redeyed"."~0.4.0" or []); + (self.nativeDeps."redeyed" or []); deps = [ - self.full."esprima"."~1.0.0" + self.by-version."esprima"."1.0.4" ]; peerDependencies = [ ]; passthru.names = [ "redeyed" ]; }; - full."redis"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."redis"."*" = + self.by-version."redis"."0.9.0"; + by-version."redis"."0.9.0" = lib.makeOverridable self.buildNodePackage { name = "redis-0.9.0"; src = [ (fetchurl { @@ -11765,15 +9480,17 @@ }) ]; buildInputs = - (self.nativeDeps."redis"."*" or []); + (self.nativeDeps."redis" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "redis" ]; }; - "redis" = self.full."redis"."*"; - full."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { + "redis" = self.by-version."redis"."0.9.0"; + by-spec."redis"."0.7.2" = + self.by-version."redis"."0.7.2"; + by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage { name = "redis-0.7.2"; src = [ (fetchurl { @@ -11782,15 +9499,17 @@ }) ]; buildInputs = - (self.nativeDeps."redis"."0.7.2" or []); + (self.nativeDeps."redis" or []); deps = [ - self.full."hiredis"."*" + self.by-version."hiredis"."0.1.15" ]; peerDependencies = [ ]; passthru.names = [ "redis" ]; }; - full."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage { + by-spec."redis"."0.7.3" = + self.by-version."redis"."0.7.3"; + by-version."redis"."0.7.3" = lib.makeOverridable self.buildNodePackage { name = "redis-0.7.3"; src = [ (fetchurl { @@ -11799,30 +9518,18 @@ }) ]; buildInputs = - (self.nativeDeps."redis"."0.7.3" or []); + (self.nativeDeps."redis" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "redis" ]; }; - full."redis".">= 0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "redis-0.9.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.9.0.tgz"; - sha1 = "b0f5b9c5619b4f1784837718677212c1af33ee67"; - }) - ]; - buildInputs = - (self.nativeDeps."redis".">= 0.6.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "redis" ]; - }; - full."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."redis".">= 0.6.6" = + self.by-version."redis"."0.9.0"; + by-spec."reds"."0.1.4" = + self.by-version."reds"."0.1.4"; + by-version."reds"."0.1.4" = lib.makeOverridable self.buildNodePackage { name = "reds-0.1.4"; src = [ (fetchurl { @@ -11831,16 +9538,36 @@ }) ]; buildInputs = - (self.nativeDeps."reds"."0.1.4" or []); + (self.nativeDeps."reds" or []); deps = [ - self.full."natural"."0.0.69" - self.full."redis".">= 0.6.6" + self.by-version."natural"."0.0.69" + self.by-version."redis"."0.9.0" ]; peerDependencies = [ ]; passthru.names = [ "reds" ]; }; - full."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."reduce-component"."1.0.1" = + self.by-version."reduce-component"."1.0.1"; + by-version."reduce-component"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "reduce-component-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }) + ]; + buildInputs = + (self.nativeDeps."reduce-component" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "reduce-component" ]; + }; + by-spec."regexp-clone"."0.0.1" = + self.by-version."regexp-clone"."0.0.1"; + by-version."regexp-clone"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "regexp-clone-0.0.1"; src = [ (fetchurl { @@ -11849,14 +9576,16 @@ }) ]; buildInputs = - (self.nativeDeps."regexp-clone"."0.0.1" or []); + (self.nativeDeps."regexp-clone" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "regexp-clone" ]; }; - full."replace"."~0.2.4" = lib.makeOverridable self.buildNodePackage { + by-spec."replace"."~0.2.4" = + self.by-version."replace"."0.2.7"; + by-version."replace"."0.2.7" = lib.makeOverridable self.buildNodePackage { name = "replace-0.2.7"; src = [ (fetchurl { @@ -11865,17 +9594,19 @@ }) ]; buildInputs = - (self.nativeDeps."replace"."~0.2.4" or []); + (self.nativeDeps."replace" or []); deps = [ - self.full."nomnom"."1.6.x" - self.full."colors"."0.5.x" - self.full."minimatch"."~0.2.9" + self.by-version."nomnom"."1.6.2" + self.by-version."colors"."0.5.1" + self.by-version."minimatch"."0.2.12" ]; peerDependencies = [ ]; passthru.names = [ "replace" ]; }; - full."request"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."2" = + self.by-version."request"."2.27.0"; + by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage { name = "request-2.27.0"; src = [ (fetchurl { @@ -11884,82 +9615,32 @@ }) ]; buildInputs = - (self.nativeDeps."request"."2" or []); + (self.nativeDeps."request" or []); deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" + self.by-version."qs"."0.6.5" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + 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" ]; }; - full."request"."2 >=2.20.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."2 >=2.20.0" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."2 >=2.25.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."2 >=2.25.0" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."2 >=2.20.0" = + self.by-version."request"."2.27.0"; + by-spec."request"."2 >=2.25.0" = + self.by-version."request"."2.27.0"; + by-spec."request"."2.16.2" = + self.by-version."request"."2.16.2"; + by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage { name = "request-2.16.2"; src = [ (fetchurl { @@ -11968,25 +9649,27 @@ }) ]; buildInputs = - (self.nativeDeps."request"."2.16.2" or []); + (self.nativeDeps."request" or []); deps = [ - self.full."form-data"."~0.0.3" - self.full."mime"."~1.2.7" - self.full."hawk"."~0.10.0" - self.full."node-uuid"."~1.4.0" - self.full."cookie-jar"."~0.2.0" - self.full."aws-sign"."~0.2.0" - self.full."oauth-sign"."~0.2.0" - self.full."forever-agent"."~0.2.0" - self.full."tunnel-agent"."~0.2.0" - self.full."json-stringify-safe"."~3.0.0" - self.full."qs"."~0.5.0" + self.by-version."form-data"."0.0.10" + self.by-version."mime"."1.2.11" + self.by-version."hawk"."0.10.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."cookie-jar"."0.2.0" + self.by-version."aws-sign"."0.2.0" + self.by-version."oauth-sign"."0.2.0" + self.by-version."forever-agent"."0.2.0" + self.by-version."tunnel-agent"."0.2.0" + self.by-version."json-stringify-safe"."3.0.0" + self.by-version."qs"."0.5.6" ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; - full."request"."2.16.x" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."2.16.x" = + self.by-version."request"."2.16.6"; + by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { name = "request-2.16.6"; src = [ (fetchurl { @@ -11995,25 +9678,27 @@ }) ]; buildInputs = - (self.nativeDeps."request"."2.16.x" or []); + (self.nativeDeps."request" or []); deps = [ - self.full."form-data"."~0.0.3" - self.full."mime"."~1.2.7" - self.full."hawk"."~0.10.2" - self.full."node-uuid"."~1.4.0" - self.full."cookie-jar"."~0.2.0" - self.full."aws-sign"."~0.2.0" - self.full."oauth-sign"."~0.2.0" - self.full."forever-agent"."~0.2.0" - self.full."tunnel-agent"."~0.2.0" - self.full."json-stringify-safe"."~3.0.0" - self.full."qs"."~0.5.4" + self.by-version."form-data"."0.0.10" + self.by-version."mime"."1.2.11" + self.by-version."hawk"."0.10.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."cookie-jar"."0.2.0" + self.by-version."aws-sign"."0.2.0" + self.by-version."oauth-sign"."0.2.0" + self.by-version."forever-agent"."0.2.0" + self.by-version."tunnel-agent"."0.2.0" + self.by-version."json-stringify-safe"."3.0.0" + self.by-version."qs"."0.5.6" ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; - full."request"."2.9.x" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."2.9.x" = + self.by-version."request"."2.9.203"; + by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage { name = "request-2.9.203"; src = [ (fetchurl { @@ -12022,97 +9707,22 @@ }) ]; buildInputs = - (self.nativeDeps."request"."2.9.x" or []); + (self.nativeDeps."request" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; - full."request".">=2.12.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; - }) - ]; - buildInputs = - (self.nativeDeps."request".">=2.12.0" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."~2" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."~2" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."~2.16.6" = lib.makeOverridable self.buildNodePackage { - name = "request-2.16.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; - sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."~2.16.6" or []); - deps = [ - self.full."form-data"."~0.0.3" - self.full."mime"."~1.2.7" - self.full."hawk"."~0.10.2" - self.full."node-uuid"."~1.4.0" - self.full."cookie-jar"."~0.2.0" - self.full."aws-sign"."~0.2.0" - self.full."oauth-sign"."~0.2.0" - self.full."forever-agent"."~0.2.0" - self.full."tunnel-agent"."~0.2.0" - self.full."json-stringify-safe"."~3.0.0" - self.full."qs"."~0.5.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."~2.21.0" = lib.makeOverridable self.buildNodePackage { + by-spec."request".">=2.12.0" = + self.by-version."request"."2.27.0"; + by-spec."request"."~2" = + self.by-version."request"."2.27.0"; + by-spec."request"."~2.16.6" = + self.by-version."request"."2.16.6"; + by-spec."request"."~2.21.0" = + self.by-version."request"."2.21.0"; + by-version."request"."2.21.0" = lib.makeOverridable self.buildNodePackage { name = "request-2.21.0"; src = [ (fetchurl { @@ -12121,54 +9731,28 @@ }) ]; buildInputs = - (self.nativeDeps."request"."~2.21.0" or []); + (self.nativeDeps."request" or []); deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~4.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.9.11" - self.full."hawk"."~0.13.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."0.0.8" + self.by-version."qs"."0.6.5" + self.by-version."json-stringify-safe"."4.0.0" + self.by-version."forever-agent"."0.5.0" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.9.11" + self.by-version."hawk"."0.13.1" + self.by-version."aws-sign"."0.3.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."cookie-jar"."0.3.0" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."form-data"."0.0.8" ]; peerDependencies = [ ]; passthru.names = [ "request" ]; }; - full."request"."~2.22.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.22.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; - sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."~2.22.0" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~4.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~0.13.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request"."~2.25.0" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."~2.25.0" = + self.by-version."request"."2.25.0"; + by-version."request"."2.25.0" = lib.makeOverridable self.buildNodePackage { name = "request-2.25.0"; src = [ (fetchurl { @@ -12177,54 +9761,30 @@ }) ]; buildInputs = - (self.nativeDeps."request"."~2.25.0" or []); + (self.nativeDeps."request" or []); deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" + self.by-version."qs"."0.6.5" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.0" + 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" ]; }; - full."request"."~2.27.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.27.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz"; - sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668"; - }) - ]; - buildInputs = - (self.nativeDeps."request"."~2.27.0" or []); - deps = [ - self.full."qs"."~0.6.0" - self.full."json-stringify-safe"."~5.0.0" - self.full."forever-agent"."~0.5.0" - self.full."tunnel-agent"."~0.3.0" - self.full."http-signature"."~0.10.0" - self.full."hawk"."~1.0.0" - self.full."aws-sign"."~0.3.0" - self.full."oauth-sign"."~0.3.0" - self.full."cookie-jar"."~0.3.0" - self.full."node-uuid"."~1.4.0" - self.full."mime"."~1.2.9" - self.full."form-data"."~0.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - full."request-progress"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."request"."~2.27.0" = + self.by-version."request"."2.27.0"; + by-spec."request-progress"."~0.3.0" = + self.by-version."request-progress"."0.3.1"; + by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "request-progress-0.3.1"; src = [ (fetchurl { @@ -12233,15 +9793,17 @@ }) ]; buildInputs = - (self.nativeDeps."request-progress"."~0.3.0" or []); + (self.nativeDeps."request-progress" or []); deps = [ - self.full."throttleit"."~0.0.2" + self.by-version."throttleit"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "request-progress" ]; }; - full."request-replay"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."request-replay"."~0.2.0" = + self.by-version."request-replay"."0.2.0"; + by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "request-replay-0.2.0"; src = [ (fetchurl { @@ -12250,15 +9812,17 @@ }) ]; buildInputs = - (self.nativeDeps."request-replay"."~0.2.0" or []); + (self.nativeDeps."request-replay" or []); deps = [ - self.full."retry"."~0.6.0" + self.by-version."retry"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "request-replay" ]; }; - full."requirejs"."~2.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."requirejs"."~2.1.0" = + self.by-version."requirejs"."2.1.9"; + by-version."requirejs"."2.1.9" = lib.makeOverridable self.buildNodePackage { name = "requirejs-2.1.9"; src = [ (fetchurl { @@ -12267,14 +9831,16 @@ }) ]; buildInputs = - (self.nativeDeps."requirejs"."~2.1.0" or []); + (self.nativeDeps."requirejs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "requirejs" ]; }; - full."resolve"."0.5.x" = lib.makeOverridable self.buildNodePackage { + by-spec."resolve"."0.5.x" = + self.by-version."resolve"."0.5.1"; + by-version."resolve"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "resolve-0.5.1"; src = [ (fetchurl { @@ -12283,14 +9849,16 @@ }) ]; buildInputs = - (self.nativeDeps."resolve"."0.5.x" or []); + (self.nativeDeps."resolve" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "resolve" ]; }; - full."resolve"."~0.3.1" = lib.makeOverridable self.buildNodePackage { + by-spec."resolve"."~0.3.1" = + self.by-version."resolve"."0.3.1"; + by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "resolve-0.3.1"; src = [ (fetchurl { @@ -12299,14 +9867,16 @@ }) ]; buildInputs = - (self.nativeDeps."resolve"."~0.3.1" or []); + (self.nativeDeps."resolve" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "resolve" ]; }; - full."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { + by-spec."restify"."2.4.1" = + self.by-version."restify"."2.4.1"; + by-version."restify"."2.4.1" = lib.makeOverridable self.buildNodePackage { name = "restify-2.4.1"; src = [ (fetchurl { @@ -12315,31 +9885,33 @@ }) ]; buildInputs = - (self.nativeDeps."restify"."2.4.1" or []); + (self.nativeDeps."restify" or []); deps = [ - self.full."assert-plus"."0.1.2" - self.full."backoff"."2.1.0" - self.full."bunyan"."0.21.1" - self.full."deep-equal"."0.0.0" - self.full."formidable"."1.0.13" - self.full."http-signature"."0.9.11" - self.full."keep-alive-agent"."0.0.1" - self.full."lru-cache"."2.3.0" - self.full."mime"."1.2.9" - self.full."negotiator"."0.2.5" - self.full."node-uuid"."1.4.0" - self.full."once"."1.1.1" - self.full."qs"."0.5.5" - self.full."semver"."1.1.4" - self.full."spdy"."1.7.1" - self.full."verror"."1.3.6" - self.full."dtrace-provider"."0.2.8" + self.by-version."assert-plus"."0.1.2" + self.by-version."backoff"."2.1.0" + self.by-version."bunyan"."0.21.1" + self.by-version."deep-equal"."0.0.0" + self.by-version."formidable"."1.0.13" + self.by-version."http-signature"."0.9.11" + self.by-version."keep-alive-agent"."0.0.1" + self.by-version."lru-cache"."2.3.0" + self.by-version."mime"."1.2.9" + self.by-version."negotiator"."0.2.5" + self.by-version."node-uuid"."1.4.0" + self.by-version."once"."1.1.1" + self.by-version."qs"."0.5.5" + self.by-version."semver"."1.1.4" + self.by-version."spdy"."1.7.1" + self.by-version."verror"."1.3.6" + self.by-version."dtrace-provider"."0.2.8" ]; peerDependencies = [ ]; passthru.names = [ "restify" ]; }; - full."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { + by-spec."retry"."0.6.0" = + self.by-version."retry"."0.6.0"; + by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "retry-0.6.0"; src = [ (fetchurl { @@ -12348,30 +9920,18 @@ }) ]; buildInputs = - (self.nativeDeps."retry"."0.6.0" or []); + (self.nativeDeps."retry" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "retry" ]; }; - full."retry"."~0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "retry-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }) - ]; - buildInputs = - (self.nativeDeps."retry"."~0.6.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "retry" ]; - }; - full."revalidator"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."retry"."~0.6.0" = + self.by-version."retry"."0.6.0"; + by-spec."revalidator"."0.1.x" = + self.by-version."revalidator"."0.1.5"; + by-version."revalidator"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "revalidator-0.1.5"; src = [ (fetchurl { @@ -12380,14 +9940,16 @@ }) ]; buildInputs = - (self.nativeDeps."revalidator"."0.1.x" or []); + (self.nativeDeps."revalidator" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "revalidator" ]; }; - full."rimraf"."1.x.x" = lib.makeOverridable self.buildNodePackage { + by-spec."rimraf"."1.x.x" = + self.by-version."rimraf"."1.0.9"; + by-version."rimraf"."1.0.9" = lib.makeOverridable self.buildNodePackage { name = "rimraf-1.0.9"; src = [ (fetchurl { @@ -12396,14 +9958,16 @@ }) ]; buildInputs = - (self.nativeDeps."rimraf"."1.x.x" or []); + (self.nativeDeps."rimraf" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - full."rimraf"."2" = lib.makeOverridable self.buildNodePackage { + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.2.2"; + by-version."rimraf"."2.2.2" = lib.makeOverridable self.buildNodePackage { name = "rimraf-2.2.2"; src = [ (fetchurl { @@ -12412,49 +9976,21 @@ }) ]; buildInputs = - (self.nativeDeps."rimraf"."2" or []); + (self.nativeDeps."rimraf" or []); deps = [ - self.full."graceful-fs"."~2" + self.by-version."graceful-fs"."2.0.1" ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - full."rimraf"."2.x.x" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; - sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf"."2.x.x" or []); - deps = [ - self.full."graceful-fs"."~2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - full."rimraf"."~2" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; - sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf"."~2" or []); - deps = [ - self.full."graceful-fs"."~2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - full."rimraf"."~2.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."rimraf"."2.x.x" = + self.by-version."rimraf"."2.2.2"; + by-spec."rimraf"."~2" = + self.by-version."rimraf"."2.2.2"; + by-spec."rimraf"."~2.0.2" = + self.by-version."rimraf"."2.0.3"; + by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { name = "rimraf-2.0.3"; src = [ (fetchurl { @@ -12463,15 +9999,17 @@ }) ]; buildInputs = - (self.nativeDeps."rimraf"."~2.0.2" or []); + (self.nativeDeps."rimraf" or []); deps = [ - self.full."graceful-fs"."~1.1" + self.by-version."graceful-fs"."1.1.14" ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - full."rimraf"."~2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."rimraf"."~2.1" = + self.by-version."rimraf"."2.1.4"; + by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { name = "rimraf-2.1.4"; src = [ (fetchurl { @@ -12480,49 +10018,21 @@ }) ]; buildInputs = - (self.nativeDeps."rimraf"."~2.1" or []); + (self.nativeDeps."rimraf" or []); deps = [ - self.full."graceful-fs"."~1" + self.by-version."graceful-fs"."1.2.3" ]; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - full."rimraf"."~2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf"."~2.1.4" or []); - deps = [ - self.full."graceful-fs"."~1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - full."rimraf"."~2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; - sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf"."~2.2.0" or []); - deps = [ - self.full."graceful-fs"."~2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - full."s3http"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."rimraf"."~2.1.4" = + self.by-version."rimraf"."2.1.4"; + by-spec."rimraf"."~2.2.0" = + self.by-version."rimraf"."2.2.2"; + by-spec."s3http"."*" = + self.by-version."s3http"."0.0.2"; + by-version."s3http"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "s3http-0.0.2"; src = [ (fetchurl { @@ -12531,18 +10041,20 @@ }) ]; buildInputs = - (self.nativeDeps."s3http"."*" or []); + (self.nativeDeps."s3http" or []); deps = [ - self.full."aws-sdk".">=1.2.0 <2" - self.full."commander"."0.5.1" - self.full."http-auth"."1.2.7" + self.by-version."aws-sdk"."1.10.0" + self.by-version."commander"."0.5.1" + self.by-version."http-auth"."1.2.7" ]; peerDependencies = [ ]; passthru.names = [ "s3http" ]; }; - "s3http" = self.full."s3http"."*"; - full."sauce-connect-launcher"."~0.1.10" = lib.makeOverridable self.buildNodePackage { + "s3http" = self.by-version."s3http"."0.0.2"; + by-spec."sauce-connect-launcher"."~0.1.10" = + self.by-version."sauce-connect-launcher"."0.1.11"; + by-version."sauce-connect-launcher"."0.1.11" = lib.makeOverridable self.buildNodePackage { name = "sauce-connect-launcher-0.1.11"; src = [ (fetchurl { @@ -12551,17 +10063,19 @@ }) ]; buildInputs = - (self.nativeDeps."sauce-connect-launcher"."~0.1.10" or []); + (self.nativeDeps."sauce-connect-launcher" or []); deps = [ - self.full."lodash"."~1.3.1" - self.full."async"."~0.2.9" - self.full."adm-zip"."~0.4.3" + self.by-version."lodash"."1.3.1" + self.by-version."async"."0.2.9" + self.by-version."adm-zip"."0.4.3" ]; peerDependencies = [ ]; passthru.names = [ "sauce-connect-launcher" ]; }; - full."sax"."0.5.x" = lib.makeOverridable self.buildNodePackage { + by-spec."sax"."0.5.x" = + self.by-version."sax"."0.5.5"; + by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage { name = "sax-0.5.5"; src = [ (fetchurl { @@ -12570,30 +10084,18 @@ }) ]; buildInputs = - (self.nativeDeps."sax"."0.5.x" or []); + (self.nativeDeps."sax" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sax" ]; }; - full."sax".">=0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.5.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.5.tgz"; - sha1 = "b1ec13d77397248d059bcc18bb9530d8210bb5d3"; - }) - ]; - buildInputs = - (self.nativeDeps."sax".">=0.4.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sax" ]; - }; - full."selenium-webdriver"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."sax".">=0.4.2" = + self.by-version."sax"."0.5.5"; + by-spec."selenium-webdriver"."*" = + self.by-version."selenium-webdriver"."2.37.0"; + by-version."selenium-webdriver"."2.37.0" = lib.makeOverridable self.buildNodePackage { name = "selenium-webdriver-2.37.0"; src = [ (fetchurl { @@ -12602,32 +10104,36 @@ }) ]; buildInputs = - (self.nativeDeps."selenium-webdriver"."*" or []); + (self.nativeDeps."selenium-webdriver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "selenium-webdriver" ]; }; - "selenium-webdriver" = self.full."selenium-webdriver"."*"; - full."semver"."*" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.1.0"; + "selenium-webdriver" = self.by-version."selenium-webdriver"."2.37.0"; + by-spec."semver"."*" = + self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; }) ]; buildInputs = - (self.nativeDeps."semver"."*" or []); + (self.nativeDeps."semver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "semver" ]; }; - "semver" = self.full."semver"."*"; - full."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { + "semver" = self.by-version."semver"."2.2.1"; + by-spec."semver"."1.1.0" = + self.by-version."semver"."1.1.0"; + by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "semver-1.1.0"; src = [ (fetchurl { @@ -12636,14 +10142,16 @@ }) ]; buildInputs = - (self.nativeDeps."semver"."1.1.0" or []); + (self.nativeDeps."semver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "semver" ]; }; - full."semver"."1.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."semver"."1.1.4" = + self.by-version."semver"."1.1.4"; + by-version."semver"."1.1.4" = lib.makeOverridable self.buildNodePackage { name = "semver-1.1.4"; src = [ (fetchurl { @@ -12652,110 +10160,28 @@ }) ]; buildInputs = - (self.nativeDeps."semver"."1.1.4" or []); + (self.nativeDeps."semver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "semver" ]; }; - full."semver"."2" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.0.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.0.8.tgz"; - sha1 = "f5c28ba4a6d56bd1d9dbe34aed288d69366a73c6"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."2.0.8" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."2.x" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."2.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver".">=2.0.10 <3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; - }) - ]; - buildInputs = - (self.nativeDeps."semver".">=2.0.10 <3.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."~1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; - sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."~1.1.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."~1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "semver-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; - sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."~1.1.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."~2.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."semver"."2" = + self.by-version."semver"."2.2.1"; + by-spec."semver"."2.x" = + self.by-version."semver"."2.2.1"; + by-spec."semver".">=2.0.10 <3.0.0" = + self.by-version."semver"."2.2.1"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.2.1"; + by-spec."semver"."~1.1.0" = + self.by-version."semver"."1.1.4"; + by-spec."semver"."~1.1.4" = + self.by-version."semver"."1.1.4"; + by-spec."semver"."~2.0.5" = + self.by-version."semver"."2.0.11"; + by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { name = "semver-2.0.11"; src = [ (fetchurl { @@ -12764,46 +10190,16 @@ }) ]; buildInputs = - (self.nativeDeps."semver"."~2.0.0" or []); + (self.nativeDeps."semver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "semver" ]; }; - full."semver"."~2.0.5" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.0.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."~2.0.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."~2.0.8" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.0.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."~2.0.8" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."semver"."~2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."semver"."~2.1.0" = + self.by-version."semver"."2.1.0"; + by-version."semver"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "semver-2.1.0"; src = [ (fetchurl { @@ -12812,30 +10208,18 @@ }) ]; buildInputs = - (self.nativeDeps."semver"."~2.1" or []); + (self.nativeDeps."semver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "semver" ]; }; - full."semver"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; - sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; - }) - ]; - buildInputs = - (self.nativeDeps."semver"."~2.1.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - full."send"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."semver"."~2.2.1" = + self.by-version."semver"."2.2.1"; + by-spec."send"."*" = + self.by-version."send"."0.1.4"; + by-version."send"."0.1.4" = lib.makeOverridable self.buildNodePackage { name = "send-0.1.4"; src = [ (fetchurl { @@ -12844,18 +10228,20 @@ }) ]; buildInputs = - (self.nativeDeps."send"."*" or []); + (self.nativeDeps."send" or []); deps = [ - self.full."debug"."*" - self.full."mime"."~1.2.9" - self.full."fresh"."0.2.0" - self.full."range-parser"."0.0.4" + self.by-version."debug"."0.7.3" + self.by-version."mime"."1.2.11" + self.by-version."fresh"."0.2.0" + self.by-version."range-parser"."0.0.4" ]; peerDependencies = [ ]; passthru.names = [ "send" ]; }; - full."send"."0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."send"."0.1.0" = + self.by-version."send"."0.1.0"; + by-version."send"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "send-0.1.0"; src = [ (fetchurl { @@ -12864,58 +10250,22 @@ }) ]; buildInputs = - (self.nativeDeps."send"."0.1.0" or []); + (self.nativeDeps."send" or []); deps = [ - self.full."debug"."*" - self.full."mime"."1.2.6" - self.full."fresh"."0.1.0" - self.full."range-parser"."0.0.4" + self.by-version."debug"."0.7.3" + self.by-version."mime"."1.2.6" + self.by-version."fresh"."0.1.0" + self.by-version."range-parser"."0.0.4" ]; peerDependencies = [ ]; passthru.names = [ "send" ]; }; - full."send"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "send-0.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.1.1.tgz"; - sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; - }) - ]; - buildInputs = - (self.nativeDeps."send"."0.1.1" or []); - deps = [ - self.full."debug"."*" - self.full."mime"."~1.2.9" - self.full."fresh"."0.1.0" - self.full."range-parser"."0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; - full."send"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "send-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; - sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; - }) - ]; - buildInputs = - (self.nativeDeps."send"."0.1.4" or []); - deps = [ - self.full."debug"."*" - self.full."mime"."~1.2.9" - self.full."fresh"."0.2.0" - self.full."range-parser"."0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; - full."sequence"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."send"."0.1.4" = + self.by-version."send"."0.1.4"; + by-spec."sequence"."*" = + self.by-version."sequence"."2.2.1"; + by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "sequence-2.2.1"; src = [ (fetchurl { @@ -12924,30 +10274,18 @@ }) ]; buildInputs = - (self.nativeDeps."sequence"."*" or []); + (self.nativeDeps."sequence" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sequence" ]; }; - full."sequence".">= 2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "sequence-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; - }) - ]; - buildInputs = - (self.nativeDeps."sequence".">= 2.2.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sequence" ]; - }; - full."setimmediate"."~1.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."sequence".">= 2.2.1" = + self.by-version."sequence"."2.2.1"; + by-spec."setimmediate"."~1.0.1" = + self.by-version."setimmediate"."1.0.1"; + by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "setimmediate-1.0.1"; src = [ (fetchurl { @@ -12956,31 +10294,16 @@ }) ]; buildInputs = - (self.nativeDeps."setimmediate"."~1.0.1" or []); + (self.nativeDeps."setimmediate" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "setimmediate" ]; }; - full."sha"."~1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; - sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; - }) - ]; - buildInputs = - (self.nativeDeps."sha"."~1.0.1" or []); - deps = [ - self.full."graceful-fs"."1.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "sha" ]; - }; - full."sha"."~1.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."sha"."~1.2.1" = + self.by-version."sha"."1.2.3"; + by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { name = "sha-1.2.3"; src = [ (fetchurl { @@ -12989,16 +10312,18 @@ }) ]; buildInputs = - (self.nativeDeps."sha"."~1.2.1" or []); + (self.nativeDeps."sha" or []); deps = [ - self.full."graceful-fs"."2" - self.full."readable-stream"."1.0" + self.by-version."graceful-fs"."2.0.1" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "sha" ]; }; - full."shelljs"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."shelljs"."0.1.x" = + self.by-version."shelljs"."0.1.4"; + by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage { name = "shelljs-0.1.4"; src = [ (fetchurl { @@ -13007,47 +10332,37 @@ }) ]; buildInputs = - (self.nativeDeps."shelljs"."0.1.x" or []); + (self.nativeDeps."shelljs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "shelljs" ]; }; - full."shelljs"."~0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "shelljs-0.1.4"; + by-spec."shelljs"."~0.1.4" = + self.by-version."shelljs"."0.1.4"; + by-spec."should"."*" = + self.by-version."should"."2.0.2"; + by-version."should"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "should-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; - sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; + url = "http://registry.npmjs.org/should/-/should-2.0.2.tgz"; + sha1 = "df48464e0804aa5db723277bb30a998ebc8a0857"; }) ]; buildInputs = - (self.nativeDeps."shelljs"."~0.1.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "shelljs" ]; - }; - full."should"."*" = lib.makeOverridable self.buildNodePackage { - name = "should-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/should/-/should-2.0.1.tgz"; - sha1 = "d244c90bb919f3e51dca472ef7d93c244eb7b79a"; - }) - ]; - buildInputs = - (self.nativeDeps."should"."*" or []); + (self.nativeDeps."should" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.full."should"."*"; - full."sigmund"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + "should" = self.by-version."should"."2.0.2"; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.0"; + by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "sigmund-1.0.0"; src = [ (fetchurl { @@ -13056,14 +10371,16 @@ }) ]; buildInputs = - (self.nativeDeps."sigmund"."~1.0.0" or []); + (self.nativeDeps."sigmund" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sigmund" ]; }; - full."signals"."<2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."signals"."<2.0" = + self.by-version."signals"."1.0.0"; + by-version."signals"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "signals-1.0.0"; src = [ (fetchurl { @@ -13072,64 +10389,40 @@ }) ]; buildInputs = - (self.nativeDeps."signals"."<2.0" or []); + (self.nativeDeps."signals" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "signals" ]; }; - full."signals".">0.7 <2.0" = lib.makeOverridable self.buildNodePackage { - name = "signals-1.0.0"; + by-spec."signals".">0.7 <2.0" = + self.by-version."signals"."1.0.0"; + by-spec."signals"."~1.0.0" = + self.by-version."signals"."1.0.0"; + by-spec."simplesmtp".">= 0.1.22" = + self.by-version."simplesmtp"."0.3.13"; + by-version."simplesmtp"."0.3.13" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; - sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.13.tgz"; + sha1 = "87d5280f04f4a0003674daf399b442e807bd7eee"; }) ]; buildInputs = - (self.nativeDeps."signals".">0.7 <2.0" or []); + (self.nativeDeps."simplesmtp" or []); deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "signals" ]; - }; - full."signals"."~1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "signals-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; - sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; - }) - ]; - buildInputs = - (self.nativeDeps."signals"."~1.0.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "signals" ]; - }; - full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.10.tgz"; - sha1 = "f395f4b118de45f82ac4fdae4bd88f12dc326f5d"; - }) - ]; - buildInputs = - (self.nativeDeps."simplesmtp".">= 0.1.22" or []); - deps = [ - self.full."rai"."~0.1" - self.full."xoauth2"."~0.1" + self.by-version."rai"."0.1.7" + self.by-version."xoauth2"."0.1.8" ]; peerDependencies = [ ]; passthru.names = [ "simplesmtp" ]; }; - full."slice-stream"."0.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."slice-stream"."0.0.0" = + self.by-version."slice-stream"."0.0.0"; + by-version."slice-stream"."0.0.0" = lib.makeOverridable self.buildNodePackage { name = "slice-stream-0.0.0"; src = [ (fetchurl { @@ -13138,15 +10431,17 @@ }) ]; buildInputs = - (self.nativeDeps."slice-stream"."0.0.0" or []); + (self.nativeDeps."slice-stream" or []); deps = [ - self.full."readable-stream"."~1.0.2" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "slice-stream" ]; }; - full."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage { + by-spec."sliced"."0.0.3" = + self.by-version."sliced"."0.0.3"; + by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "sliced-0.0.3"; src = [ (fetchurl { @@ -13155,14 +10450,16 @@ }) ]; buildInputs = - (self.nativeDeps."sliced"."0.0.3" or []); + (self.nativeDeps."sliced" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sliced" ]; }; - full."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."sliced"."0.0.4" = + self.by-version."sliced"."0.0.4"; + by-version."sliced"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "sliced-0.0.4"; src = [ (fetchurl { @@ -13171,14 +10468,16 @@ }) ]; buildInputs = - (self.nativeDeps."sliced"."0.0.4" or []); + (self.nativeDeps."sliced" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sliced" ]; }; - full."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage { + by-spec."sliced"."0.0.5" = + self.by-version."sliced"."0.0.5"; + by-version."sliced"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "sliced-0.0.5"; src = [ (fetchurl { @@ -13187,14 +10486,16 @@ }) ]; buildInputs = - (self.nativeDeps."sliced"."0.0.5" or []); + (self.nativeDeps."sliced" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sliced" ]; }; - full."slide"."~1.1.3" = lib.makeOverridable self.buildNodePackage { + by-spec."slide"."~1.1.3" = + self.by-version."slide"."1.1.5"; + by-version."slide"."1.1.5" = lib.makeOverridable self.buildNodePackage { name = "slide-1.1.5"; src = [ (fetchurl { @@ -13203,46 +10504,18 @@ }) ]; buildInputs = - (self.nativeDeps."slide"."~1.1.3" or []); + (self.nativeDeps."slide" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "slide" ]; }; - full."slide"."~1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; - sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; - }) - ]; - buildInputs = - (self.nativeDeps."slide"."~1.1.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "slide" ]; - }; - full."slide"."~1.1.5" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; - sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; - }) - ]; - buildInputs = - (self.nativeDeps."slide"."~1.1.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "slide" ]; - }; - full."smartdc"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."slide"."~1.1.5" = + self.by-version."slide"."1.1.5"; + by-spec."smartdc"."*" = + self.by-version."smartdc"."7.1.1"; + by-version."smartdc"."7.1.1" = lib.makeOverridable self.buildNodePackage { name = "smartdc-7.1.1"; src = [ (fetchurl { @@ -13251,22 +10524,24 @@ }) ]; buildInputs = - (self.nativeDeps."smartdc"."*" or []); + (self.nativeDeps."smartdc" or []); deps = [ - self.full."assert-plus"."0.1.2" - self.full."lru-cache"."2.2.0" - self.full."nopt"."2.0.0" - self.full."restify"."2.4.1" - self.full."bunyan"."0.21.1" - self.full."clone"."0.1.6" - self.full."smartdc-auth"."1.0.1" + self.by-version."assert-plus"."0.1.2" + self.by-version."lru-cache"."2.2.0" + self.by-version."nopt"."2.0.0" + self.by-version."restify"."2.4.1" + self.by-version."bunyan"."0.21.1" + self.by-version."clone"."0.1.6" + self.by-version."smartdc-auth"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "smartdc" ]; }; - "smartdc" = self.full."smartdc"."*"; - full."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage { + "smartdc" = self.by-version."smartdc"."7.1.1"; + by-spec."smartdc-auth"."1.0.1" = + self.by-version."smartdc-auth"."1.0.1"; + by-version."smartdc-auth"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "smartdc-auth-1.0.1"; src = [ (fetchurl { @@ -13275,19 +10550,21 @@ }) ]; buildInputs = - (self.nativeDeps."smartdc-auth"."1.0.1" or []); + (self.nativeDeps."smartdc-auth" or []); deps = [ - self.full."assert-plus"."0.1.2" - self.full."clone"."0.1.5" - self.full."ssh-agent"."0.2.1" - self.full."once"."1.1.1" - self.full."vasync"."1.3.3" + self.by-version."assert-plus"."0.1.2" + self.by-version."clone"."0.1.5" + self.by-version."ssh-agent"."0.2.1" + self.by-version."once"."1.1.1" + self.by-version."vasync"."1.3.3" ]; peerDependencies = [ ]; passthru.names = [ "smartdc-auth" ]; }; - full."sntp"."0.1.x" = lib.makeOverridable self.buildNodePackage { + by-spec."sntp"."0.1.x" = + self.by-version."sntp"."0.1.4"; + by-version."sntp"."0.1.4" = lib.makeOverridable self.buildNodePackage { name = "sntp-0.1.4"; src = [ (fetchurl { @@ -13296,15 +10573,17 @@ }) ]; buildInputs = - (self.nativeDeps."sntp"."0.1.x" or []); + (self.nativeDeps."sntp" or []); deps = [ - self.full."hoek"."0.7.x" + self.by-version."hoek"."0.7.6" ]; peerDependencies = [ ]; passthru.names = [ "sntp" ]; }; - full."sntp"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { name = "sntp-0.2.4"; src = [ (fetchurl { @@ -13313,15 +10592,17 @@ }) ]; buildInputs = - (self.nativeDeps."sntp"."0.2.x" or []); + (self.nativeDeps."sntp" or []); deps = [ - self.full."hoek"."0.9.x" + self.by-version."hoek"."0.9.1" ]; peerDependencies = [ ]; passthru.names = [ "sntp" ]; }; - full."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage { + by-spec."socket.io"."0.9.14" = + self.by-version."socket.io"."0.9.14"; + by-version."socket.io"."0.9.14" = lib.makeOverridable self.buildNodePackage { name = "socket.io-0.9.14"; src = [ (fetchurl { @@ -13330,18 +10611,20 @@ }) ]; buildInputs = - (self.nativeDeps."socket.io"."0.9.14" or []); + (self.nativeDeps."socket.io" or []); deps = [ - self.full."socket.io-client"."0.9.11" - self.full."policyfile"."0.0.4" - self.full."base64id"."0.1.0" - self.full."redis"."0.7.3" + self.by-version."socket.io-client"."0.9.11" + self.by-version."policyfile"."0.0.4" + self.by-version."base64id"."0.1.0" + self.by-version."redis"."0.7.3" ]; peerDependencies = [ ]; passthru.names = [ "socket.io" ]; }; - full."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { + by-spec."socket.io"."0.9.16" = + self.by-version."socket.io"."0.9.16"; + by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage { name = "socket.io-0.9.16"; src = [ (fetchurl { @@ -13350,58 +10633,24 @@ }) ]; buildInputs = - (self.nativeDeps."socket.io"."0.9.16" or []); + (self.nativeDeps."socket.io" or []); deps = [ - self.full."socket.io-client"."0.9.16" - self.full."policyfile"."0.0.4" - self.full."base64id"."0.1.0" - self.full."redis"."0.7.3" + self.by-version."socket.io-client"."0.9.16" + self.by-version."policyfile"."0.0.4" + self.by-version."base64id"."0.1.0" + self.by-version."redis"."0.7.3" ]; peerDependencies = [ ]; passthru.names = [ "socket.io" ]; }; - full."socket.io"."~0.9.13" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-0.9.16"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; - sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; - }) - ]; - buildInputs = - (self.nativeDeps."socket.io"."~0.9.13" or []); - deps = [ - self.full."socket.io-client"."0.9.16" - self.full."policyfile"."0.0.4" - self.full."base64id"."0.1.0" - self.full."redis"."0.7.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socket.io" ]; - }; - full."socket.io"."~0.9.14" = lib.makeOverridable self.buildNodePackage { - name = "socket.io-0.9.16"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz"; - sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76"; - }) - ]; - buildInputs = - (self.nativeDeps."socket.io"."~0.9.14" or []); - deps = [ - self.full."socket.io-client"."0.9.16" - self.full."policyfile"."0.0.4" - self.full."base64id"."0.1.0" - self.full."redis"."0.7.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socket.io" ]; - }; - full."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { + by-spec."socket.io"."~0.9.13" = + self.by-version."socket.io"."0.9.16"; + by-spec."socket.io"."~0.9.14" = + self.by-version."socket.io"."0.9.16"; + by-spec."socket.io-client"."0.9.11" = + self.by-version."socket.io-client"."0.9.11"; + by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage { name = "socket.io-client-0.9.11"; src = [ (fetchurl { @@ -13410,18 +10659,20 @@ }) ]; buildInputs = - (self.nativeDeps."socket.io-client"."0.9.11" or []); + (self.nativeDeps."socket.io-client" or []); deps = [ - self.full."uglify-js"."1.2.5" - self.full."ws"."0.4.x" - self.full."xmlhttprequest"."1.4.2" - self.full."active-x-obfuscator"."0.0.1" + self.by-version."uglify-js"."1.2.5" + self.by-version."ws"."0.4.31" + self.by-version."xmlhttprequest"."1.4.2" + self.by-version."active-x-obfuscator"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "socket.io-client" ]; }; - full."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage { + by-spec."socket.io-client"."0.9.16" = + self.by-version."socket.io-client"."0.9.16"; + by-version."socket.io-client"."0.9.16" = lib.makeOverridable self.buildNodePackage { name = "socket.io-client-0.9.16"; src = [ (fetchurl { @@ -13430,18 +10681,20 @@ }) ]; buildInputs = - (self.nativeDeps."socket.io-client"."0.9.16" or []); + (self.nativeDeps."socket.io-client" or []); deps = [ - self.full."uglify-js"."1.2.5" - self.full."ws"."0.4.x" - self.full."xmlhttprequest"."1.4.2" - self.full."active-x-obfuscator"."0.0.1" + self.by-version."uglify-js"."1.2.5" + self.by-version."ws"."0.4.31" + self.by-version."xmlhttprequest"."1.4.2" + self.by-version."active-x-obfuscator"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "socket.io-client" ]; }; - full."sockjs"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."sockjs"."*" = + self.by-version."sockjs"."0.3.8"; + by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage { name = "sockjs-0.3.8"; src = [ (fetchurl { @@ -13450,69 +10703,45 @@ }) ]; buildInputs = - (self.nativeDeps."sockjs"."*" or []); + (self.nativeDeps."sockjs" or []); deps = [ - self.full."node-uuid"."1.3.3" - self.full."faye-websocket"."0.7.0" + self.by-version."node-uuid"."1.3.3" + self.by-version."faye-websocket"."0.7.0" ]; peerDependencies = [ ]; passthru.names = [ "sockjs" ]; }; - "sockjs" = self.full."sockjs"."*"; - full."source-map"."*" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.30"; + "sockjs" = self.by-version."sockjs"."0.3.8"; + by-spec."source-map"."*" = + self.by-version."source-map"."0.1.31"; + by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { + name = "source-map-0.1.31"; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz"; - sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }) ]; buildInputs = - (self.nativeDeps."source-map"."*" or []); + (self.nativeDeps."source-map" or []); deps = [ - self.full."amdefine".">=0.0.4" + self.by-version."amdefine"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.full."source-map"."*"; - full."source-map".">= 0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.30"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz"; - sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb"; - }) - ]; - buildInputs = - (self.nativeDeps."source-map".">= 0.1.2" or []); - deps = [ - self.full."amdefine".">=0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "source-map" ]; - }; - full."source-map"."~0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.30"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.30.tgz"; - sha1 = "182726b50671d8fccaefc5ec35bf2a65c1956afb"; - }) - ]; - buildInputs = - (self.nativeDeps."source-map"."~0.1.7" or []); - deps = [ - self.full."amdefine".">=0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "source-map" ]; - }; - full."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { + "source-map" = self.by-version."source-map"."0.1.31"; + by-spec."source-map"."0.1.x" = + self.by-version."source-map"."0.1.31"; + by-spec."source-map".">= 0.1.2" = + self.by-version."source-map"."0.1.31"; + by-spec."source-map"."~0.1.7" = + self.by-version."source-map"."0.1.31"; + by-spec."spdy"."1.7.1" = + self.by-version."spdy"."1.7.1"; + by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { name = "spdy-1.7.1"; src = [ (fetchurl { @@ -13521,14 +10750,16 @@ }) ]; buildInputs = - (self.nativeDeps."spdy"."1.7.1" or []); + (self.nativeDeps."spdy" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "spdy" ]; }; - full."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."ssh-agent"."0.2.1" = + self.by-version."ssh-agent"."0.2.1"; + by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "ssh-agent-0.2.1"; src = [ (fetchurl { @@ -13537,33 +10768,38 @@ }) ]; buildInputs = - (self.nativeDeps."ssh-agent"."0.2.1" or []); + (self.nativeDeps."ssh-agent" or []); deps = [ - self.full."ctype"."0.5.0" - self.full."posix-getopt"."1.0.0" + self.by-version."ctype"."0.5.0" + self.by-version."posix-getopt"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "ssh-agent" ]; }; - full."ssh2"."0.2.8" = lib.makeOverridable self.buildNodePackage { - name = "ssh2-0.2.8"; + by-spec."ssh2"."~0.2.12" = + self.by-version."ssh2"."0.2.12"; + by-version."ssh2"."0.2.12" = lib.makeOverridable self.buildNodePackage { + name = "ssh2-0.2.12"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.8.tgz"; - sha1 = "50acd6d7a7fb4da18ef4364737bb9a5066bf689d"; + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.12.tgz"; + sha1 = "38ba81c58d6a3e9af1b27548f1819266b3a39c4a"; }) ]; buildInputs = - (self.nativeDeps."ssh2"."0.2.8" or []); + (self.nativeDeps."ssh2" or []); deps = [ - self.full."streamsearch"."0.1.2" + self.by-version."streamsearch"."0.1.2" + self.by-version."asn1"."0.1.11" ]; peerDependencies = [ ]; passthru.names = [ "ssh2" ]; }; - full."stack-trace"."0.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.7"; + by-version."stack-trace"."0.0.7" = lib.makeOverridable self.buildNodePackage { name = "stack-trace-0.0.7"; src = [ (fetchurl { @@ -13572,14 +10808,16 @@ }) ]; buildInputs = - (self.nativeDeps."stack-trace"."0.0.x" or []); + (self.nativeDeps."stack-trace" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "stack-trace" ]; }; - full."statsd"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."statsd"."*" = + self.by-version."statsd"."0.6.0"; + by-version."statsd"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "statsd-0.6.0"; src = [ (fetchurl { @@ -13588,17 +10826,19 @@ }) ]; buildInputs = - (self.nativeDeps."statsd"."*" or []); + (self.nativeDeps."statsd" or []); deps = [ - self.full."node-syslog"."1.1.3" - self.full."winser"."=0.0.11" + self.by-version."node-syslog"."1.1.3" + self.by-version."winser"."0.0.11" ]; peerDependencies = [ ]; passthru.names = [ "statsd" ]; }; - "statsd" = self.full."statsd"."*"; - full."stream-counter"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + "statsd" = self.by-version."statsd"."0.6.0"; + by-spec."stream-counter"."~0.1.0" = + self.by-version."stream-counter"."0.1.0"; + by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "stream-counter-0.1.0"; src = [ (fetchurl { @@ -13607,15 +10847,17 @@ }) ]; buildInputs = - (self.nativeDeps."stream-counter"."~0.1.0" or []); + (self.nativeDeps."stream-counter" or []); deps = [ - self.full."readable-stream"."~1.0.2" + self.by-version."readable-stream"."1.0.17" ]; peerDependencies = [ ]; passthru.names = [ "stream-counter" ]; }; - full."stream-counter"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."stream-counter"."~0.2.0" = + self.by-version."stream-counter"."0.2.0"; + by-version."stream-counter"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "stream-counter-0.2.0"; src = [ (fetchurl { @@ -13624,15 +10866,17 @@ }) ]; buildInputs = - (self.nativeDeps."stream-counter"."~0.2.0" or []); + (self.nativeDeps."stream-counter" or []); deps = [ - self.full."readable-stream"."~1.1.8" + self.by-version."readable-stream"."1.1.9" ]; peerDependencies = [ ]; passthru.names = [ "stream-counter" ]; }; - full."stream-splitter-transform"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."stream-splitter-transform"."*" = + self.by-version."stream-splitter-transform"."0.0.3"; + by-version."stream-splitter-transform"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "stream-splitter-transform-0.0.3"; src = [ (fetchurl { @@ -13641,16 +10885,18 @@ }) ]; buildInputs = - (self.nativeDeps."stream-splitter-transform"."*" or []); + (self.nativeDeps."stream-splitter-transform" or []); deps = [ - self.full."buffertools".">=1.1.1 <2.0.0" + self.by-version."buffertools"."1.1.1" ]; peerDependencies = [ ]; passthru.names = [ "stream-splitter-transform" ]; }; - "stream-splitter-transform" = self.full."stream-splitter-transform"."*"; - full."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { + "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.3"; + by-spec."streamsearch"."0.1.2" = + self.by-version."streamsearch"."0.1.2"; + by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { name = "streamsearch-0.1.2"; src = [ (fetchurl { @@ -13659,14 +10905,16 @@ }) ]; buildInputs = - (self.nativeDeps."streamsearch"."0.1.2" or []); + (self.nativeDeps."streamsearch" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "streamsearch" ]; }; - full."stringify-object"."~0.1.4" = lib.makeOverridable self.buildNodePackage { + by-spec."stringify-object"."~0.1.4" = + self.by-version."stringify-object"."0.1.7"; + by-version."stringify-object"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "stringify-object-0.1.7"; src = [ (fetchurl { @@ -13675,14 +10923,16 @@ }) ]; buildInputs = - (self.nativeDeps."stringify-object"."~0.1.4" or []); + (self.nativeDeps."stringify-object" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "stringify-object" ]; }; - full."strong-data-uri"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."strong-data-uri"."~0.1.0" = + self.by-version."strong-data-uri"."0.1.0"; + by-version."strong-data-uri"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "strong-data-uri-0.1.0"; src = [ (fetchurl { @@ -13691,36 +10941,40 @@ }) ]; buildInputs = - (self.nativeDeps."strong-data-uri"."~0.1.0" or []); + (self.nativeDeps."strong-data-uri" or []); deps = [ - self.full."truncate"."~1.0.2" + self.by-version."truncate"."1.0.2" ]; peerDependencies = [ ]; passthru.names = [ "strong-data-uri" ]; }; - full."stylus"."*" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.38.0"; + by-spec."stylus"."*" = + self.by-version."stylus"."0.40.0"; + by-version."stylus"."0.40.0" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.40.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.38.0.tgz"; - sha1 = "6bd0581db0ee0491251639d338685f7232ca0610"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.40.0.tgz"; + sha1 = "497b6242f3952417482acad65627a6988125b634"; }) ]; buildInputs = - (self.nativeDeps."stylus"."*" or []); + (self.nativeDeps."stylus" or []); deps = [ - self.full."cssom"."0.2.x" - self.full."mkdirp"."0.3.x" - self.full."debug"."*" - self.full."sax"."0.5.x" + self.by-version."cssom"."0.2.5" + self.by-version."mkdirp"."0.3.5" + self.by-version."debug"."0.7.3" + self.by-version."sax"."0.5.5" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.full."stylus"."*"; - full."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { + "stylus" = self.by-version."stylus"."0.40.0"; + by-spec."stylus"."0.27.2" = + self.by-version."stylus"."0.27.2"; + by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { name = "stylus-0.27.2"; src = [ (fetchurl { @@ -13729,17 +10983,19 @@ }) ]; buildInputs = - (self.nativeDeps."stylus"."0.27.2" or []); + (self.nativeDeps."stylus" or []); deps = [ - self.full."cssom"."0.2.x" - self.full."mkdirp"."0.3.x" - self.full."debug"."*" + self.by-version."cssom"."0.2.5" + self.by-version."mkdirp"."0.3.5" + self.by-version."debug"."0.7.3" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - full."sudo-block"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."sudo-block"."~0.2.0" = + self.by-version."sudo-block"."0.2.1"; + by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage { name = "sudo-block-0.2.1"; src = [ (fetchurl { @@ -13748,37 +11004,17 @@ }) ]; buildInputs = - (self.nativeDeps."sudo-block"."~0.2.0" or []); + (self.nativeDeps."sudo-block" or []); deps = [ - self.full."chalk"."~0.1.1" + self.by-version."chalk"."0.1.1" ]; peerDependencies = [ ]; passthru.names = [ "sudo-block" ]; }; - full."superagent"."0.14.7" = lib.makeOverridable self.buildNodePackage { - name = "superagent-0.14.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.14.7.tgz"; - sha1 = "5740625d9c6343381b03b2ff95a3c988415fc406"; - }) - ]; - buildInputs = - (self.nativeDeps."superagent"."0.14.7" or []); - deps = [ - self.full."qs"."0.6.5" - self.full."formidable"."1.0.9" - self.full."mime"."1.2.5" - self.full."emitter-component"."1.0.0" - self.full."methods"."0.0.1" - self.full."cookiejar"."1.3.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "superagent" ]; - }; - full."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage { + by-spec."superagent"."0.15.1" = + self.by-version."superagent"."0.15.1"; + by-version."superagent"."0.15.1" = lib.makeOverridable self.buildNodePackage { name = "superagent-0.15.1"; src = [ (fetchurl { @@ -13787,21 +11023,23 @@ }) ]; buildInputs = - (self.nativeDeps."superagent"."0.15.1" or []); + (self.nativeDeps."superagent" or []); deps = [ - self.full."qs"."0.6.5" - self.full."formidable"."1.0.9" - self.full."mime"."1.2.5" - self.full."emitter-component"."1.0.0" - self.full."methods"."0.0.1" - self.full."cookiejar"."1.3.0" - self.full."debug"."~0.7.2" + self.by-version."qs"."0.6.5" + self.by-version."formidable"."1.0.9" + 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.3" ]; peerDependencies = [ ]; passthru.names = [ "superagent" ]; }; - full."superagent"."~0.13.0" = lib.makeOverridable self.buildNodePackage { + by-spec."superagent"."~0.13.0" = + self.by-version."superagent"."0.13.0"; + by-version."superagent"."0.13.0" = lib.makeOverridable self.buildNodePackage { name = "superagent-0.13.0"; src = [ (fetchurl { @@ -13810,39 +11048,69 @@ }) ]; buildInputs = - (self.nativeDeps."superagent"."~0.13.0" or []); + (self.nativeDeps."superagent" or []); deps = [ - self.full."qs"."0.5.2" - self.full."formidable"."1.0.9" - self.full."mime"."1.2.5" - self.full."emitter-component"."0.0.6" - self.full."methods"."0.0.1" - self.full."cookiejar"."1.3.0" + self.by-version."qs"."0.5.2" + self.by-version."formidable"."1.0.9" + self.by-version."mime"."1.2.5" + self.by-version."emitter-component"."0.0.6" + self.by-version."methods"."0.0.1" + self.by-version."cookiejar"."1.3.0" ]; peerDependencies = [ ]; passthru.names = [ "superagent" ]; }; - full."supertest"."*" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.8.0"; + by-spec."superagent"."~0.15.7" = + self.by-version."superagent"."0.15.7"; + by-version."superagent"."0.15.7" = lib.makeOverridable self.buildNodePackage { + name = "superagent-0.15.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.8.0.tgz"; - sha1 = "c8dd008358ed60175cfd4dfab0ab1af81d0dc55b"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.15.7.tgz"; + sha1 = "095c70b8afffbc072f1458f39684d4854d6333a3"; }) ]; buildInputs = - (self.nativeDeps."supertest"."*" or []); + (self.nativeDeps."superagent" or []); deps = [ - self.full."superagent"."0.15.1" - self.full."methods"."0.0.1" + 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.3" + self.by-version."reduce-component"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "superagent" ]; + }; + by-spec."supertest"."*" = + self.by-version."supertest"."0.8.1"; + by-version."supertest"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "supertest-0.8.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/supertest/-/supertest-0.8.1.tgz"; + sha1 = "be792b92481d8e33a4ebe8907495c5192387d101"; + }) + ]; + buildInputs = + (self.nativeDeps."supertest" or []); + deps = [ + self.by-version."superagent"."0.15.1" + self.by-version."methods"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "supertest" ]; }; - "supertest" = self.full."supertest"."*"; - full."swig"."0.14.x" = lib.makeOverridable self.buildNodePackage { + "supertest" = self.by-version."supertest"."0.8.1"; + by-spec."swig"."0.14.x" = + self.by-version."swig"."0.14.0"; + by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage { name = "swig-0.14.0"; src = [ (fetchurl { @@ -13851,16 +11119,18 @@ }) ]; buildInputs = - (self.nativeDeps."swig"."0.14.x" or []); + (self.nativeDeps."swig" or []); deps = [ - self.full."underscore".">=1.1.7" + self.by-version."underscore"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "swig" ]; }; - "swig" = self.full."swig"."0.14.x"; - full."sylvester".">= 0.0.12" = lib.makeOverridable self.buildNodePackage { + "swig" = self.by-version."swig"."0.14.0"; + by-spec."sylvester".">= 0.0.12" = + self.by-version."sylvester"."0.0.21"; + by-version."sylvester"."0.0.21" = lib.makeOverridable self.buildNodePackage { name = "sylvester-0.0.21"; src = [ (fetchurl { @@ -13869,30 +11139,18 @@ }) ]; buildInputs = - (self.nativeDeps."sylvester".">= 0.0.12" or []); + (self.nativeDeps."sylvester" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "sylvester" ]; }; - full."sylvester".">= 0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "sylvester-0.0.21"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; - sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; - }) - ]; - buildInputs = - (self.nativeDeps."sylvester".">= 0.0.8" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sylvester" ]; - }; - full."tar"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."sylvester".">= 0.0.8" = + self.by-version."sylvester"."0.0.21"; + by-spec."tar"."*" = + self.by-version."tar"."0.1.18"; + by-version."tar"."0.1.18" = lib.makeOverridable self.buildNodePackage { name = "tar-0.1.18"; src = [ (fetchurl { @@ -13901,37 +11159,22 @@ }) ]; buildInputs = - (self.nativeDeps."tar"."*" or []); + (self.nativeDeps."tar" or []); deps = [ - self.full."inherits"."2" - self.full."block-stream"."*" - self.full."fstream"."~0.1.8" + self.by-version."inherits"."2.0.1" + self.by-version."block-stream"."0.0.7" + self.by-version."fstream"."0.1.24" ]; peerDependencies = [ ]; passthru.names = [ "tar" ]; }; - "tar" = self.full."tar"."*"; - full."tar"."0" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.18"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; - sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; - }) - ]; - buildInputs = - (self.nativeDeps."tar"."0" or []); - deps = [ - self.full."inherits"."2" - self.full."block-stream"."*" - self.full."fstream"."~0.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - full."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { + "tar" = self.by-version."tar"."0.1.18"; + by-spec."tar"."0" = + self.by-version."tar"."0.1.18"; + by-spec."tar"."0.1.17" = + self.by-version."tar"."0.1.17"; + by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage { name = "tar-0.1.17"; src = [ (fetchurl { @@ -13940,72 +11183,23 @@ }) ]; buildInputs = - (self.nativeDeps."tar"."0.1.17" or []); + (self.nativeDeps."tar" or []); deps = [ - self.full."inherits"."1.x" - self.full."block-stream"."*" - self.full."fstream"."~0.1.8" + self.by-version."inherits"."1.0.0" + self.by-version."block-stream"."0.0.7" + self.by-version."fstream"."0.1.24" ]; peerDependencies = [ ]; passthru.names = [ "tar" ]; }; - full."tar"."~0.1.17" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.18"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; - sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; - }) - ]; - buildInputs = - (self.nativeDeps."tar"."~0.1.17" or []); - deps = [ - self.full."inherits"."2" - self.full."block-stream"."*" - self.full."fstream"."~0.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - full."tar"."~0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.18"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; - sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; - }) - ]; - buildInputs = - (self.nativeDeps."tar"."~0.1.18" or []); - deps = [ - self.full."inherits"."2" - self.full."block-stream"."*" - self.full."fstream"."~0.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - full."taskgroup"."~3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "taskgroup-3.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.2.3.tgz"; - sha1 = "5bbfa9fb0312f04251140f2f858f8f4ee0086958"; - }) - ]; - buildInputs = - (self.nativeDeps."taskgroup"."~3.2.0" or []); - deps = [ - self.full."ambi"."~2.1.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "taskgroup" ]; - }; - full."temp"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."tar"."~0.1.17" = + self.by-version."tar"."0.1.18"; + by-spec."tar"."~0.1.18" = + self.by-version."tar"."0.1.18"; + by-spec."temp"."*" = + self.by-version."temp"."0.6.0"; + by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { name = "temp-0.6.0"; src = [ (fetchurl { @@ -14014,35 +11208,21 @@ }) ]; buildInputs = - (self.nativeDeps."temp"."*" or []); + (self.nativeDeps."temp" or []); deps = [ - self.full."rimraf"."~2.1.4" - self.full."osenv"."0.0.3" + self.by-version."rimraf"."2.1.4" + self.by-version."osenv"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "temp" ]; }; - "temp" = self.full."temp"."*"; - full."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; - sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; - }) - ]; - buildInputs = - (self.nativeDeps."temp"."0.6.0" or []); - deps = [ - self.full."rimraf"."~2.1.4" - self.full."osenv"."0.0.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "temp" ]; - }; - full."text-table"."~0.1.1" = lib.makeOverridable self.buildNodePackage { + "temp" = self.by-version."temp"."0.6.0"; + by-spec."temp"."0.6.0" = + self.by-version."temp"."0.6.0"; + by-spec."text-table"."~0.1.1" = + self.by-version."text-table"."0.1.1"; + by-version."text-table"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "text-table-0.1.1"; src = [ (fetchurl { @@ -14051,14 +11231,16 @@ }) ]; buildInputs = - (self.nativeDeps."text-table"."~0.1.1" or []); + (self.nativeDeps."text-table" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "text-table" ]; }; - full."throttleit"."~0.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."throttleit"."~0.0.2" = + self.by-version."throttleit"."0.0.2"; + by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "throttleit-0.0.2"; src = [ (fetchurl { @@ -14067,14 +11249,16 @@ }) ]; buildInputs = - (self.nativeDeps."throttleit"."~0.0.2" or []); + (self.nativeDeps."throttleit" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "throttleit" ]; }; - full."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."timespan"."2.0.1" = + self.by-version."timespan"."2.0.1"; + by-version."timespan"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "timespan-2.0.1"; src = [ (fetchurl { @@ -14083,14 +11267,16 @@ }) ]; buildInputs = - (self.nativeDeps."timespan"."2.0.1" or []); + (self.nativeDeps."timespan" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "timespan" ]; }; - full."timezone"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."timezone"."*" = + self.by-version."timezone"."0.0.23"; + by-version."timezone"."0.0.23" = lib.makeOverridable self.buildNodePackage { name = "timezone-0.0.23"; src = [ (fetchurl { @@ -14099,15 +11285,17 @@ }) ]; buildInputs = - (self.nativeDeps."timezone"."*" or []); + (self.nativeDeps."timezone" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "timezone" ]; }; - "timezone" = self.full."timezone"."*"; - full."tinycolor"."0.x" = lib.makeOverridable self.buildNodePackage { + "timezone" = self.by-version."timezone"."0.0.23"; + by-spec."tinycolor"."0.x" = + self.by-version."tinycolor"."0.0.1"; + by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "tinycolor-0.0.1"; src = [ (fetchurl { @@ -14116,14 +11304,16 @@ }) ]; buildInputs = - (self.nativeDeps."tinycolor"."0.x" or []); + (self.nativeDeps."tinycolor" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "tinycolor" ]; }; - full."tmp"."~0.0.20" = lib.makeOverridable self.buildNodePackage { + by-spec."tmp"."~0.0.20" = + self.by-version."tmp"."0.0.21"; + by-version."tmp"."0.0.21" = lib.makeOverridable self.buildNodePackage { name = "tmp-0.0.21"; src = [ (fetchurl { @@ -14132,14 +11322,34 @@ }) ]; buildInputs = - (self.nativeDeps."tmp"."~0.0.20" or []); + (self.nativeDeps."tmp" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "tmp" ]; }; - full."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."traceback".">=0.3.0 && < 0.4" = + self.by-version."traceback"."0.3.0"; + by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "traceback-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/traceback/-/traceback-0.3.0.tgz"; + sha1 = "4e147f07cd332fbd0330ba510b942a5c9256a0ab"; + }) + ]; + buildInputs = + (self.nativeDeps."traceback" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "traceback" ]; + }; + by-spec."transformers"."2.1.0" = + self.by-version."transformers"."2.1.0"; + by-version."transformers"."2.1.0" = lib.makeOverridable self.buildNodePackage { name = "transformers-2.1.0"; src = [ (fetchurl { @@ -14148,17 +11358,19 @@ }) ]; buildInputs = - (self.nativeDeps."transformers"."2.1.0" or []); + (self.nativeDeps."transformers" or []); deps = [ - self.full."promise"."~2.0" - self.full."css"."~1.0.8" - self.full."uglify-js"."~2.2.5" + self.by-version."promise"."2.0.0" + self.by-version."css"."1.0.8" + self.by-version."uglify-js"."2.2.5" ]; peerDependencies = [ ]; passthru.names = [ "transformers" ]; }; - full."traverse".">=0.3.0 <0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."traverse".">=0.3.0 <0.4" = + self.by-version."traverse"."0.3.9"; + by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage { name = "traverse-0.3.9"; src = [ (fetchurl { @@ -14167,14 +11379,16 @@ }) ]; buildInputs = - (self.nativeDeps."traverse".">=0.3.0 <0.4" or []); + (self.nativeDeps."traverse" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "traverse" ]; }; - full."truncate"."~1.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."truncate"."~1.0.2" = + self.by-version."truncate"."1.0.2"; + by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "truncate-1.0.2"; src = [ (fetchurl { @@ -14183,14 +11397,16 @@ }) ]; buildInputs = - (self.nativeDeps."truncate"."~1.0.2" or []); + (self.nativeDeps."truncate" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "truncate" ]; }; - full."tunnel-agent"."~0.2.0" = lib.makeOverridable self.buildNodePackage { + by-spec."tunnel-agent"."~0.2.0" = + self.by-version."tunnel-agent"."0.2.0"; + by-version."tunnel-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "tunnel-agent-0.2.0"; src = [ (fetchurl { @@ -14199,14 +11415,16 @@ }) ]; buildInputs = - (self.nativeDeps."tunnel-agent"."~0.2.0" or []); + (self.nativeDeps."tunnel-agent" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "tunnel-agent" ]; }; - full."tunnel-agent"."~0.3.0" = lib.makeOverridable self.buildNodePackage { + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "tunnel-agent-0.3.0"; src = [ (fetchurl { @@ -14215,14 +11433,16 @@ }) ]; buildInputs = - (self.nativeDeps."tunnel-agent"."~0.3.0" or []); + (self.nativeDeps."tunnel-agent" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "tunnel-agent" ]; }; - full."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { + by-spec."type-detect"."0.1.1" = + self.by-version."type-detect"."0.1.1"; + by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { name = "type-detect-0.1.1"; src = [ (fetchurl { @@ -14231,46 +11451,34 @@ }) ]; buildInputs = - (self.nativeDeps."type-detect"."0.1.1" or []); + (self.nativeDeps."type-detect" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "type-detect" ]; }; - full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "typechecker-2.0.6"; + by-spec."typechecker"."~2.0.1" = + self.by-version."typechecker"."2.0.8"; + by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "typechecker-2.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.6.tgz"; - sha1 = "f9dc9a161d05957c5e8225b7470261e16a8409cb"; + url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz"; + sha1 = "e83da84bb64c584ccb345838576c40b0337db82e"; }) ]; buildInputs = - (self.nativeDeps."typechecker"."~2.0.1" or []); + (self.nativeDeps."typechecker" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "typechecker" ]; }; - full."typechecker"."~2.0.6" = lib.makeOverridable self.buildNodePackage { - name = "typechecker-2.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.6.tgz"; - sha1 = "f9dc9a161d05957c5e8225b7470261e16a8409cb"; - }) - ]; - buildInputs = - (self.nativeDeps."typechecker"."~2.0.6" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "typechecker" ]; - }; - full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { + by-spec."uglify-js"."1.2.5" = + self.by-version."uglify-js"."1.2.5"; + by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-1.2.5"; src = [ (fetchurl { @@ -14279,14 +11487,16 @@ }) ]; buildInputs = - (self.nativeDeps."uglify-js"."1.2.5" or []); + (self.nativeDeps."uglify-js" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; - full."uglify-js"."2.4.0" = lib.makeOverridable self.buildNodePackage { + by-spec."uglify-js"."2.4.0" = + self.by-version."uglify-js"."2.4.0"; + by-version."uglify-js"."2.4.0" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.4.0"; src = [ (fetchurl { @@ -14295,18 +11505,20 @@ }) ]; buildInputs = - (self.nativeDeps."uglify-js"."2.4.0" or []); + (self.nativeDeps."uglify-js" or []); deps = [ - self.full."async"."~0.2.6" - self.full."source-map"."~0.1.7" - self.full."optimist"."~0.3.5" - self.full."uglify-to-browserify"."~1.0.0" + self.by-version."async"."0.2.9" + self.by-version."source-map"."0.1.31" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; - full."uglify-js"."~2.2.5" = lib.makeOverridable self.buildNodePackage { + by-spec."uglify-js"."~2.2.5" = + self.by-version."uglify-js"."2.2.5"; + by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.2.5"; src = [ (fetchurl { @@ -14315,16 +11527,18 @@ }) ]; buildInputs = - (self.nativeDeps."uglify-js"."~2.2.5" or []); + (self.nativeDeps."uglify-js" or []); deps = [ - self.full."source-map"."~0.1.7" - self.full."optimist"."~0.3.5" + self.by-version."source-map"."0.1.31" + self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; - full."uglify-js"."~2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."uglify-js"."~2.3" = + self.by-version."uglify-js"."2.3.6"; + by-version."uglify-js"."2.3.6" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-2.3.6"; src = [ (fetchurl { @@ -14333,37 +11547,41 @@ }) ]; buildInputs = - (self.nativeDeps."uglify-js"."~2.3" or []); + (self.nativeDeps."uglify-js" or []); deps = [ - self.full."async"."~0.2.6" - self.full."source-map"."~0.1.7" - self.full."optimist"."~0.3.5" + self.by-version."async"."0.2.9" + self.by-version."source-map"."0.1.31" + self.by-version."optimist"."0.3.7" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; - full."uglify-js"."~2.4.0" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.0"; + by-spec."uglify-js"."~2.4.0" = + self.by-version."uglify-js"."2.4.2"; + by-version."uglify-js"."2.4.2" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz"; - sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.2.tgz"; + sha1 = "9301b81a179b7f82be0118f0768d8df01a8afe89"; }) ]; buildInputs = - (self.nativeDeps."uglify-js"."~2.4.0" or []); + (self.nativeDeps."uglify-js" or []); deps = [ - self.full."async"."~0.2.6" - self.full."source-map"."~0.1.7" - self.full."optimist"."~0.3.5" - self.full."uglify-to-browserify"."~1.0.0" + self.by-version."async"."0.2.9" + self.by-version."source-map"."0.1.31" + self.by-version."optimist"."0.3.7" + self.by-version."uglify-to-browserify"."1.0.1" ]; peerDependencies = [ ]; passthru.names = [ "uglify-js" ]; }; - full."uglify-to-browserify"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + by-spec."uglify-to-browserify"."~1.0.0" = + self.by-version."uglify-to-browserify"."1.0.1"; + by-version."uglify-to-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "uglify-to-browserify-1.0.1"; src = [ (fetchurl { @@ -14372,14 +11590,16 @@ }) ]; buildInputs = - (self.nativeDeps."uglify-to-browserify"."~1.0.0" or []); + (self.nativeDeps."uglify-to-browserify" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "uglify-to-browserify" ]; }; - full."uid-number"."0" = lib.makeOverridable self.buildNodePackage { + by-spec."uid-number"."0" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { name = "uid-number-0.0.3"; src = [ (fetchurl { @@ -14388,14 +11608,16 @@ }) ]; buildInputs = - (self.nativeDeps."uid-number"."0" or []); + (self.nativeDeps."uid-number" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "uid-number" ]; }; - full."uid2"."0.0.2" = lib.makeOverridable self.buildNodePackage { + by-spec."uid2"."0.0.2" = + self.by-version."uid2"."0.0.2"; + by-version."uid2"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "uid2-0.0.2"; src = [ (fetchurl { @@ -14404,14 +11626,34 @@ }) ]; buildInputs = - (self.nativeDeps."uid2"."0.0.2" or []); + (self.nativeDeps."uid2" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "uid2" ]; }; - full."underscore"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."uid2"."0.0.3" = + self.by-version."uid2"."0.0.3"; + by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "uid2-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }) + ]; + buildInputs = + (self.nativeDeps."uid2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "uid2" ]; + }; + by-spec."underscore"."*" = + self.by-version."underscore"."1.5.2"; + by-version."underscore"."1.5.2" = lib.makeOverridable self.buildNodePackage { name = "underscore-1.5.2"; src = [ (fetchurl { @@ -14420,15 +11662,17 @@ }) ]; buildInputs = - (self.nativeDeps."underscore"."*" or []); + (self.nativeDeps."underscore" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "underscore" ]; }; - "underscore" = self.full."underscore"."*"; - full."underscore"."1.4.x" = lib.makeOverridable self.buildNodePackage { + "underscore" = self.by-version."underscore"."1.5.2"; + by-spec."underscore"."1.4.x" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { name = "underscore-1.4.4"; src = [ (fetchurl { @@ -14437,110 +11681,28 @@ }) ]; buildInputs = - (self.nativeDeps."underscore"."1.4.x" or []); + (self.nativeDeps."underscore" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "underscore" ]; }; - full."underscore".">=1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore".">=1.1.7" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore".">=1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore".">=1.4.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore"."~1.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore"."~1.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore"."~1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore"."~1.4.3" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore"."~1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore"."~1.4.4" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore"."~1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore"."~1.5.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - full."underscore.string"."~2.2.0rc" = lib.makeOverridable self.buildNodePackage { + by-spec."underscore".">=1.1.7" = + self.by-version."underscore"."1.5.2"; + by-spec."underscore".">=1.4.3" = + self.by-version."underscore"."1.5.2"; + by-spec."underscore"."~1.4" = + self.by-version."underscore"."1.4.4"; + by-spec."underscore"."~1.4.3" = + self.by-version."underscore"."1.4.4"; + by-spec."underscore"."~1.4.4" = + self.by-version."underscore"."1.4.4"; + by-spec."underscore"."~1.5.2" = + self.by-version."underscore"."1.5.2"; + by-spec."underscore.string"."~2.2.0rc" = + self.by-version."underscore.string"."2.2.1"; + by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "underscore.string-2.2.1"; src = [ (fetchurl { @@ -14549,14 +11711,16 @@ }) ]; buildInputs = - (self.nativeDeps."underscore.string"."~2.2.0rc" or []); + (self.nativeDeps."underscore.string" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "underscore.string" ]; }; - full."underscore.string"."~2.3.1" = lib.makeOverridable self.buildNodePackage { + by-spec."underscore.string"."~2.3.1" = + self.by-version."underscore.string"."2.3.3"; + by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage { name = "underscore.string-2.3.3"; src = [ (fetchurl { @@ -14565,59 +11729,62 @@ }) ]; buildInputs = - (self.nativeDeps."underscore.string"."~2.3.1" or []); + (self.nativeDeps."underscore.string" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "underscore.string" ]; }; - full."ungit"."*" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.3.2"; + by-spec."ungit"."*" = + self.by-version."ungit"."0.5.0"; + by-version."ungit"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "ungit-0.5.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.3.2.tgz"; - sha1 = "bb52c4af06280e81c6499cc92f13436e0fefa0d8"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.5.0.tgz"; + sha1 = "89abd98e200c6bf7b102d3efc45eebf79ac1cdcc"; }) ]; buildInputs = - (self.nativeDeps."ungit"."*" or []); + (self.nativeDeps."ungit" or []); deps = [ - self.full."express"."3.2.6" - self.full."superagent"."0.14.7" - self.full."lodash.debounce"."~2.2.0" - self.full."lodash.find"."~2.2.0" - self.full."lodash.throttle"."~2.2.0" - self.full."temp"."0.6.0" - self.full."socket.io"."0.9.16" - self.full."moment"."2.0.0" - self.full."async"."0.2.9" - self.full."ssh2"."0.2.8" - self.full."rc"."0.3.0" - self.full."uuid"."1.4.1" - self.full."winston"."0.7.1" - self.full."passport"."0.1.17" - self.full."passport-local"."0.1.6" - self.full."npm"."1.3.1" - self.full."semver"."2.0.8" - self.full."forever-monitor"."1.1.0" - self.full."open"."0.0.4" - self.full."optimist"."0.6.0" - self.full."crossroads"."~0.12.0" - self.full."signals"."~1.0.0" - self.full."hasher"."~1.1.4" - self.full."blueimp-md5"."~1.0.3" - self.full."color"."~0.4.4" - self.full."keen.io"."0.0.3" - self.full."getmac"."~1.0.5" - self.full."deep-extend"."~0.2.6" + self.by-version."express"."3.4.4" + self.by-version."superagent"."0.15.7" + self.by-version."lodash"."2.2.1" + self.by-version."temp"."0.6.0" + self.by-version."socket.io"."0.9.16" + self.by-version."moment"."2.4.0" + self.by-version."async"."0.2.9" + self.by-version."ssh2"."0.2.12" + self.by-version."rc"."0.3.1" + self.by-version."uuid"."1.4.1" + self.by-version."winston"."0.7.2" + self.by-version."passport"."0.1.17" + self.by-version."passport-local"."0.1.6" + self.by-version."npm"."1.3.13" + self.by-version."semver"."2.2.1" + self.by-version."forever-monitor"."1.1.0" + self.by-version."open"."0.0.4" + self.by-version."optimist"."0.6.0" + self.by-version."crossroads"."0.12.0" + self.by-version."signals"."1.0.0" + self.by-version."hasher"."1.1.4" + self.by-version."blueimp-md5"."1.0.3" + self.by-version."color"."0.4.4" + self.by-version."keen.io"."0.0.3" + self.by-version."getmac"."1.0.6" + self.by-version."deep-extend"."0.2.6" + self.by-version."raven"."0.5.4" ]; peerDependencies = [ ]; passthru.names = [ "ungit" ]; }; - "ungit" = self.full."ungit"."*"; - full."unzip"."~0.1.7" = lib.makeOverridable self.buildNodePackage { + "ungit" = self.by-version."ungit"."0.5.0"; + by-spec."unzip"."~0.1.7" = + self.by-version."unzip"."0.1.9"; + by-version."unzip"."0.1.9" = lib.makeOverridable self.buildNodePackage { name = "unzip-0.1.9"; src = [ (fetchurl { @@ -14626,40 +11793,46 @@ }) ]; buildInputs = - (self.nativeDeps."unzip"."~0.1.7" or []); + (self.nativeDeps."unzip" or []); deps = [ - self.full."fstream"."~0.1.21" - self.full."pullstream"."~0.4.0" - self.full."binary"."~0.3.0" - self.full."readable-stream"."~1.0.0" - self.full."setimmediate"."~1.0.1" - self.full."match-stream"."~0.0.2" + self.by-version."fstream"."0.1.24" + self.by-version."pullstream"."0.4.0" + self.by-version."binary"."0.3.0" + self.by-version."readable-stream"."1.0.17" + self.by-version."setimmediate"."1.0.1" + self.by-version."match-stream"."0.0.2" ]; peerDependencies = [ ]; passthru.names = [ "unzip" ]; }; - full."update-notifier"."~0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "update-notifier-0.1.6"; + by-spec."update-notifier"."~0.1.3" = + self.by-version."update-notifier"."0.1.7"; + by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "update-notifier-0.1.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.6.tgz"; - sha1 = "c814e7eabaadaba789f75c3f652366db8efec471"; + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.7.tgz"; + sha1 = "b37fb55004835240fd2e7e360c52ccffde5219c9"; }) ]; buildInputs = - (self.nativeDeps."update-notifier"."~0.1.3" or []); + (self.nativeDeps."update-notifier" or []); deps = [ - self.full."request"."~2.22.0" - self.full."configstore"."~0.1.0" - self.full."semver"."~2.0.0" - self.full."chalk"."~0.1.0" + self.by-version."request"."2.27.0" + self.by-version."configstore"."0.1.5" + self.by-version."semver"."2.1.0" + self.by-version."chalk"."0.2.1" ]; peerDependencies = [ ]; passthru.names = [ "update-notifier" ]; }; - full."useragent"."~2.0.4" = lib.makeOverridable self.buildNodePackage { + by-spec."update-notifier"."~0.1.5" = + self.by-version."update-notifier"."0.1.7"; + by-spec."useragent"."~2.0.4" = + self.by-version."useragent"."2.0.7"; + by-version."useragent"."2.0.7" = lib.makeOverridable self.buildNodePackage { name = "useragent-2.0.7"; src = [ (fetchurl { @@ -14668,15 +11841,17 @@ }) ]; buildInputs = - (self.nativeDeps."useragent"."~2.0.4" or []); + (self.nativeDeps."useragent" or []); deps = [ - self.full."lru-cache"."2.2.x" + self.by-version."lru-cache"."2.2.4" ]; peerDependencies = [ ]; passthru.names = [ "useragent" ]; }; - full."util".">= 0.4.9" = lib.makeOverridable self.buildNodePackage { + by-spec."util".">= 0.4.9" = + self.by-version."util"."0.4.9"; + by-version."util"."0.4.9" = lib.makeOverridable self.buildNodePackage { name = "util-0.4.9"; src = [ (fetchurl { @@ -14685,15 +11860,17 @@ }) ]; buildInputs = - (self.nativeDeps."util".">= 0.4.9" or []); + (self.nativeDeps."util" or []); deps = [ - self.full."events.node".">= 0.4.0" + self.by-version."events.node"."0.4.9" ]; peerDependencies = [ ]; passthru.names = [ "util" ]; }; - full."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { + by-spec."utile"."0.1.7" = + self.by-version."utile"."0.1.7"; + by-version."utile"."0.1.7" = lib.makeOverridable self.buildNodePackage { name = "utile-0.1.7"; src = [ (fetchurl { @@ -14702,42 +11879,24 @@ }) ]; buildInputs = - (self.nativeDeps."utile"."0.1.7" or []); + (self.nativeDeps."utile" or []); deps = [ - self.full."async"."0.1.x" - self.full."deep-equal"."*" - self.full."i"."0.3.x" - self.full."mkdirp"."0.x.x" - self.full."ncp"."0.2.x" - self.full."rimraf"."1.x.x" + self.by-version."async"."0.1.22" + self.by-version."deep-equal"."0.1.0" + self.by-version."i"."0.3.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."ncp"."0.2.7" + self.by-version."rimraf"."1.0.9" ]; peerDependencies = [ ]; passthru.names = [ "utile" ]; }; - full."utile"."0.1.x" = lib.makeOverridable self.buildNodePackage { - name = "utile-0.1.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; - sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; - }) - ]; - buildInputs = - (self.nativeDeps."utile"."0.1.x" or []); - deps = [ - self.full."async"."0.1.x" - self.full."deep-equal"."*" - self.full."i"."0.3.x" - self.full."mkdirp"."0.x.x" - self.full."ncp"."0.2.x" - self.full."rimraf"."1.x.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "utile" ]; - }; - full."utile"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."utile"."0.1.x" = + self.by-version."utile"."0.1.7"; + by-spec."utile"."0.2.x" = + self.by-version."utile"."0.2.0"; + by-version."utile"."0.2.0" = lib.makeOverridable self.buildNodePackage { name = "utile-0.2.0"; src = [ (fetchurl { @@ -14746,42 +11905,24 @@ }) ]; buildInputs = - (self.nativeDeps."utile"."0.2.x" or []); + (self.nativeDeps."utile" or []); deps = [ - self.full."async"."0.1.x" - self.full."deep-equal"."*" - self.full."i"."0.3.x" - self.full."mkdirp"."0.x.x" - self.full."ncp"."0.2.x" - self.full."rimraf"."2.x.x" + self.by-version."async"."0.1.22" + self.by-version."deep-equal"."0.1.0" + self.by-version."i"."0.3.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."ncp"."0.2.7" + self.by-version."rimraf"."2.2.2" ]; peerDependencies = [ ]; passthru.names = [ "utile" ]; }; - full."utile"."~0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "utile-0.1.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; - sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; - }) - ]; - buildInputs = - (self.nativeDeps."utile"."~0.1.7" or []); - deps = [ - self.full."async"."0.1.x" - self.full."deep-equal"."*" - self.full."i"."0.3.x" - self.full."mkdirp"."0.x.x" - self.full."ncp"."0.2.x" - self.full."rimraf"."1.x.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "utile" ]; - }; - full."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + by-spec."utile"."~0.1.7" = + self.by-version."utile"."0.1.7"; + by-spec."uuid"."1.4.1" = + self.by-version."uuid"."1.4.1"; + by-version."uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { name = "uuid-1.4.1"; src = [ (fetchurl { @@ -14790,14 +11931,16 @@ }) ]; buildInputs = - (self.nativeDeps."uuid"."1.4.1" or []); + (self.nativeDeps."uuid" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "uuid" ]; }; - full."validator"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."validator"."0.4.x" = + self.by-version."validator"."0.4.28"; + by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage { name = "validator-0.4.28"; src = [ (fetchurl { @@ -14806,14 +11949,16 @@ }) ]; buildInputs = - (self.nativeDeps."validator"."0.4.x" or []); + (self.nativeDeps."validator" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "validator" ]; }; - full."vargs"."~0.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."vargs"."~0.1.0" = + self.by-version."vargs"."0.1.0"; + by-version."vargs"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "vargs-0.1.0"; src = [ (fetchurl { @@ -14822,14 +11967,16 @@ }) ]; buildInputs = - (self.nativeDeps."vargs"."~0.1.0" or []); + (self.nativeDeps."vargs" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "vargs" ]; }; - full."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage { + by-spec."vasync"."1.3.3" = + self.by-version."vasync"."1.3.3"; + by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage { name = "vasync-1.3.3"; src = [ (fetchurl { @@ -14838,16 +11985,18 @@ }) ]; buildInputs = - (self.nativeDeps."vasync"."1.3.3" or []); + (self.nativeDeps."vasync" or []); deps = [ - self.full."jsprim"."0.3.0" - self.full."verror"."1.1.0" + self.by-version."jsprim"."0.3.0" + self.by-version."verror"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "vasync" ]; }; - full."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."verror"."1.1.0" = + self.by-version."verror"."1.1.0"; + by-version."verror"."1.1.0" = lib.makeOverridable self.buildNodePackage { name = "verror-1.1.0"; src = [ (fetchurl { @@ -14856,15 +12005,17 @@ }) ]; buildInputs = - (self.nativeDeps."verror"."1.1.0" or []); + (self.nativeDeps."verror" or []); deps = [ - self.full."extsprintf"."1.0.0" + self.by-version."extsprintf"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "verror" ]; }; - full."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage { + by-spec."verror"."1.3.3" = + self.by-version."verror"."1.3.3"; + by-version."verror"."1.3.3" = lib.makeOverridable self.buildNodePackage { name = "verror-1.3.3"; src = [ (fetchurl { @@ -14873,15 +12024,17 @@ }) ]; buildInputs = - (self.nativeDeps."verror"."1.3.3" or []); + (self.nativeDeps."verror" or []); deps = [ - self.full."extsprintf"."1.0.0" + self.by-version."extsprintf"."1.0.0" ]; peerDependencies = [ ]; passthru.names = [ "verror" ]; }; - full."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage { + by-spec."verror"."1.3.6" = + self.by-version."verror"."1.3.6"; + by-version."verror"."1.3.6" = lib.makeOverridable self.buildNodePackage { name = "verror-1.3.6"; src = [ (fetchurl { @@ -14890,15 +12043,17 @@ }) ]; buildInputs = - (self.nativeDeps."verror"."1.3.6" or []); + (self.nativeDeps."verror" or []); deps = [ - self.full."extsprintf"."1.0.2" + self.by-version."extsprintf"."1.0.2" ]; peerDependencies = [ ]; passthru.names = [ "verror" ]; }; - full."view-helpers"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."view-helpers"."*" = + self.by-version."view-helpers"."0.1.3"; + by-version."view-helpers"."0.1.3" = lib.makeOverridable self.buildNodePackage { name = "view-helpers-0.1.3"; src = [ (fetchurl { @@ -14907,15 +12062,17 @@ }) ]; buildInputs = - (self.nativeDeps."view-helpers"."*" or []); + (self.nativeDeps."view-helpers" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "view-helpers" ]; }; - "view-helpers" = self.full."view-helpers"."*"; - full."vows".">=0.5.13" = lib.makeOverridable self.buildNodePackage { + "view-helpers" = self.by-version."view-helpers"."0.1.3"; + by-spec."vows".">=0.5.13" = + self.by-version."vows"."0.7.0"; + by-version."vows"."0.7.0" = lib.makeOverridable self.buildNodePackage { name = "vows-0.7.0"; src = [ (fetchurl { @@ -14924,16 +12081,18 @@ }) ]; buildInputs = - (self.nativeDeps."vows".">=0.5.13" or []); + (self.nativeDeps."vows" or []); deps = [ - self.full."eyes".">=0.1.6" - self.full."diff"."~1.0.3" + self.by-version."eyes"."0.1.8" + self.by-version."diff"."1.0.7" ]; peerDependencies = [ ]; passthru.names = [ "vows" ]; }; - full."walk"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."walk"."*" = + self.by-version."walk"."2.2.1"; + by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "walk-2.2.1"; src = [ (fetchurl { @@ -14942,16 +12101,18 @@ }) ]; buildInputs = - (self.nativeDeps."walk"."*" or []); + (self.nativeDeps."walk" or []); deps = [ - self.full."forEachAsync"."~2.2" + self.by-version."forEachAsync"."2.2.0" ]; peerDependencies = [ ]; passthru.names = [ "walk" ]; }; - "walk" = self.full."walk"."*"; - full."watch"."0.5.x" = lib.makeOverridable self.buildNodePackage { + "walk" = self.by-version."walk"."2.2.1"; + by-spec."watch"."0.5.x" = + self.by-version."watch"."0.5.1"; + by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage { name = "watch-0.5.1"; src = [ (fetchurl { @@ -14960,14 +12121,16 @@ }) ]; buildInputs = - (self.nativeDeps."watch"."0.5.x" or []); + (self.nativeDeps."watch" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "watch" ]; }; - full."watch"."0.7.0" = lib.makeOverridable self.buildNodePackage { + by-spec."watch"."0.7.0" = + self.by-version."watch"."0.7.0"; + by-version."watch"."0.7.0" = lib.makeOverridable self.buildNodePackage { name = "watch-0.7.0"; src = [ (fetchurl { @@ -14976,14 +12139,16 @@ }) ]; buildInputs = - (self.nativeDeps."watch"."0.7.0" or []); + (self.nativeDeps."watch" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "watch" ]; }; - full."wd"."~0.1.5" = lib.makeOverridable self.buildNodePackage { + by-spec."wd"."~0.1.5" = + self.by-version."wd"."0.1.5"; + by-version."wd"."0.1.5" = lib.makeOverridable self.buildNodePackage { name = "wd-0.1.5"; src = [ (fetchurl { @@ -14992,44 +12157,48 @@ }) ]; buildInputs = - (self.nativeDeps."wd"."~0.1.5" or []); + (self.nativeDeps."wd" or []); deps = [ - self.full."async"."0.2.x" - self.full."vargs"."~0.1.0" - self.full."q"."0.9.x" - self.full."request"."~2.21.0" - self.full."archiver"."~0.4.6" - self.full."lodash"."~1.3.1" + self.by-version."async"."0.2.9" + self.by-version."vargs"."0.1.0" + self.by-version."q"."0.9.7" + self.by-version."request"."2.21.0" + self.by-version."archiver"."0.4.10" + self.by-version."lodash"."1.3.1" ]; peerDependencies = [ ]; passthru.names = [ "wd" ]; }; - full."webdrvr"."*" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.35.0-6"; + by-spec."webdrvr"."*" = + self.by-version."webdrvr"."2.37.0-0"; + by-version."webdrvr"."2.37.0-0" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.37.0-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.35.0-6.tgz"; - sha1 = "1dffadb2960c82c7b9baba6512cd6f35f6e8d706"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-0.tgz"; + sha1 = "fc939fd7faa364d790bbb20760227346236df07e"; }) ]; buildInputs = - (self.nativeDeps."webdrvr"."*" or []); + (self.nativeDeps."webdrvr" or []); deps = [ - self.full."adm-zip"."~0.4.3" - self.full."kew"."~0.1.7" - self.full."mkdirp"."~0.3.5" - self.full."npmconf"."~0.1.2" - self.full."phantomjs"."~1.9.1-2" - self.full."tmp"."~0.0.20" - self.full."follow-redirects"."0.0.3" + self.by-version."adm-zip"."0.4.3" + self.by-version."kew"."0.1.7" + self.by-version."mkdirp"."0.3.5" + self.by-version."npmconf"."0.1.5" + self.by-version."phantomjs"."1.9.2-2" + self.by-version."tmp"."0.0.21" + self.by-version."follow-redirects"."0.0.3" ]; peerDependencies = [ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.full."webdrvr"."*"; - full."websocket-driver".">=0.3.0" = lib.makeOverridable self.buildNodePackage { + "webdrvr" = self.by-version."webdrvr"."2.37.0-0"; + by-spec."websocket-driver".">=0.3.0" = + self.by-version."websocket-driver"."0.3.0"; + by-version."websocket-driver"."0.3.0" = lib.makeOverridable self.buildNodePackage { name = "websocket-driver-0.3.0"; src = [ (fetchurl { @@ -15038,14 +12207,16 @@ }) ]; buildInputs = - (self.nativeDeps."websocket-driver".">=0.3.0" or []); + (self.nativeDeps."websocket-driver" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "websocket-driver" ]; }; - full."when"."~2.2.1" = lib.makeOverridable self.buildNodePackage { + by-spec."when"."~2.2.1" = + self.by-version."when"."2.2.1"; + by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage { name = "when-2.2.1"; src = [ (fetchurl { @@ -15054,14 +12225,16 @@ }) ]; buildInputs = - (self.nativeDeps."when"."~2.2.1" or []); + (self.nativeDeps."when" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "when" ]; }; - full."which"."1" = lib.makeOverridable self.buildNodePackage { + 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"; src = [ (fetchurl { @@ -15070,46 +12243,20 @@ }) ]; buildInputs = - (self.nativeDeps."which"."1" or []); + (self.nativeDeps."which" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "which" ]; }; - full."which"."1.0.x" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; - sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; - }) - ]; - buildInputs = - (self.nativeDeps."which"."1.0.x" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "which" ]; - }; - full."which"."~1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; - sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; - }) - ]; - buildInputs = - (self.nativeDeps."which"."~1.0.5" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "which" ]; - }; - full."winser"."=0.0.11" = lib.makeOverridable self.buildNodePackage { + by-spec."which"."1.0.x" = + self.by-version."which"."1.0.5"; + by-spec."which"."~1.0.5" = + self.by-version."which"."1.0.5"; + by-spec."winser"."=0.0.11" = + self.by-version."winser"."0.0.11"; + by-version."winser"."0.0.11" = lib.makeOverridable self.buildNodePackage { name = "winser-0.0.11"; src = [ (fetchurl { @@ -15118,16 +12265,18 @@ }) ]; buildInputs = - (self.nativeDeps."winser"."=0.0.11" or []); + (self.nativeDeps."winser" or []); deps = [ - self.full."sequence"."*" - self.full."commander"."*" + self.by-version."sequence"."2.2.1" + self.by-version."commander"."2.0.0" ]; peerDependencies = [ ]; passthru.names = [ "winser" ]; }; - full."winston"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."winston"."*" = + self.by-version."winston"."0.7.2"; + by-version."winston"."0.7.2" = lib.makeOverridable self.buildNodePackage { name = "winston-0.7.2"; src = [ (fetchurl { @@ -15136,22 +12285,24 @@ }) ]; buildInputs = - (self.nativeDeps."winston"."*" or []); + (self.nativeDeps."winston" or []); deps = [ - self.full."async"."0.2.x" - self.full."colors"."0.6.x" - self.full."cycle"."1.0.x" - self.full."eyes"."0.1.x" - self.full."pkginfo"."0.3.x" - self.full."request"."2.16.x" - self.full."stack-trace"."0.0.x" + self.by-version."async"."0.2.9" + self.by-version."colors"."0.6.2" + self.by-version."cycle"."1.0.2" + self.by-version."eyes"."0.1.8" + self.by-version."pkginfo"."0.3.0" + self.by-version."request"."2.16.6" + self.by-version."stack-trace"."0.0.7" ]; peerDependencies = [ ]; passthru.names = [ "winston" ]; }; - "winston" = self.full."winston"."*"; - full."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { + "winston" = self.by-version."winston"."0.7.2"; + by-spec."winston"."0.6.2" = + self.by-version."winston"."0.6.2"; + by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { name = "winston-0.6.2"; src = [ (fetchurl { @@ -15160,44 +12311,25 @@ }) ]; buildInputs = - (self.nativeDeps."winston"."0.6.2" or []); + (self.nativeDeps."winston" or []); deps = [ - self.full."async"."0.1.x" - self.full."colors"."0.x.x" - self.full."cycle"."1.0.x" - self.full."eyes"."0.1.x" - self.full."pkginfo"."0.2.x" - self.full."request"."2.9.x" - self.full."stack-trace"."0.0.x" + self.by-version."async"."0.1.22" + self.by-version."colors"."0.6.2" + self.by-version."cycle"."1.0.2" + self.by-version."eyes"."0.1.8" + self.by-version."pkginfo"."0.2.3" + self.by-version."request"."2.9.203" + self.by-version."stack-trace"."0.0.7" ]; peerDependencies = [ ]; passthru.names = [ "winston" ]; }; - full."winston"."0.6.x" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; - sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; - }) - ]; - buildInputs = - (self.nativeDeps."winston"."0.6.x" or []); - deps = [ - self.full."async"."0.1.x" - self.full."colors"."0.x.x" - self.full."cycle"."1.0.x" - self.full."eyes"."0.1.x" - self.full."pkginfo"."0.2.x" - self.full."request"."2.9.x" - self.full."stack-trace"."0.0.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "winston" ]; - }; - full."winston"."0.7.1" = lib.makeOverridable self.buildNodePackage { + by-spec."winston"."0.6.x" = + self.by-version."winston"."0.6.2"; + by-spec."winston"."0.7.1" = + self.by-version."winston"."0.7.1"; + by-version."winston"."0.7.1" = lib.makeOverridable self.buildNodePackage { name = "winston-0.7.1"; src = [ (fetchurl { @@ -15206,21 +12338,25 @@ }) ]; buildInputs = - (self.nativeDeps."winston"."0.7.1" or []); + (self.nativeDeps."winston" or []); deps = [ - self.full."async"."0.2.x" - self.full."colors"."0.6.x" - self.full."cycle"."1.0.x" - self.full."eyes"."0.1.x" - self.full."pkginfo"."0.3.x" - self.full."request"."2.16.x" - self.full."stack-trace"."0.0.x" + self.by-version."async"."0.2.9" + self.by-version."colors"."0.6.2" + self.by-version."cycle"."1.0.2" + self.by-version."eyes"."0.1.8" + self.by-version."pkginfo"."0.3.0" + self.by-version."request"."2.16.6" + self.by-version."stack-trace"."0.0.7" ]; peerDependencies = [ ]; passthru.names = [ "winston" ]; }; - full."with"."~1.1.0" = lib.makeOverridable self.buildNodePackage { + by-spec."winston"."~0.7.2" = + self.by-version."winston"."0.7.2"; + by-spec."with"."~1.1.0" = + self.by-version."with"."1.1.1"; + by-version."with"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "with-1.1.1"; src = [ (fetchurl { @@ -15229,15 +12365,17 @@ }) ]; buildInputs = - (self.nativeDeps."with"."~1.1.0" or []); + (self.nativeDeps."with" or []); deps = [ - self.full."uglify-js"."2.4.0" + self.by-version."uglify-js"."2.4.0" ]; peerDependencies = [ ]; passthru.names = [ "with" ]; }; - full."wordwrap"."0.0.x" = lib.makeOverridable self.buildNodePackage { + by-spec."wordwrap"."0.0.x" = + self.by-version."wordwrap"."0.0.2"; + by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "wordwrap-0.0.2"; src = [ (fetchurl { @@ -15246,46 +12384,20 @@ }) ]; buildInputs = - (self.nativeDeps."wordwrap"."0.0.x" or []); + (self.nativeDeps."wordwrap" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "wordwrap" ]; }; - full."wordwrap".">=0.0.1 <0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap".">=0.0.1 <0.1.0" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; - }; - full."wordwrap"."~0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap"."~0.0.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; - }; - full."ws"."0.4.x" = lib.makeOverridable self.buildNodePackage { + by-spec."wordwrap".">=0.0.1 <0.1.0" = + self.by-version."wordwrap"."0.0.2"; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.2"; + by-spec."ws"."0.4.x" = + self.by-version."ws"."0.4.31"; + by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { name = "ws-0.4.31"; src = [ (fetchurl { @@ -15294,18 +12406,20 @@ }) ]; buildInputs = - (self.nativeDeps."ws"."0.4.x" or []); + (self.nativeDeps."ws" or []); deps = [ - self.full."commander"."~0.6.1" - self.full."nan"."~0.3.0" - self.full."tinycolor"."0.x" - self.full."options".">=0.0.5" + self.by-version."commander"."0.6.1" + self.by-version."nan"."0.3.2" + self.by-version."tinycolor"."0.0.1" + self.by-version."options"."0.0.5" ]; peerDependencies = [ ]; passthru.names = [ "ws" ]; }; - full."wu"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."wu"."*" = + self.by-version."wu"."0.1.8"; + by-version."wu"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "wu-0.1.8"; src = [ (fetchurl { @@ -15314,15 +12428,17 @@ }) ]; buildInputs = - (self.nativeDeps."wu"."*" or []); + (self.nativeDeps."wu" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "wu" ]; }; - "wu" = self.full."wu"."*"; - full."x509"."*" = lib.makeOverridable self.buildNodePackage { + "wu" = self.by-version."wu"."0.1.8"; + by-spec."x509"."*" = + self.by-version."x509"."0.0.6"; + by-version."x509"."0.0.6" = lib.makeOverridable self.buildNodePackage { name = "x509-0.0.6"; src = [ (fetchurl { @@ -15331,15 +12447,17 @@ }) ]; buildInputs = - (self.nativeDeps."x509"."*" or []); + (self.nativeDeps."x509" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "x509" ]; }; - "x509" = self.full."x509"."*"; - full."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { + "x509" = self.by-version."x509"."0.0.6"; + by-spec."xml2js"."0.2.4" = + self.by-version."xml2js"."0.2.4"; + by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { name = "xml2js-0.2.4"; src = [ (fetchurl { @@ -15348,15 +12466,17 @@ }) ]; buildInputs = - (self.nativeDeps."xml2js"."0.2.4" or []); + (self.nativeDeps."xml2js" or []); deps = [ - self.full."sax".">=0.4.2" + self.by-version."sax"."0.5.5" ]; peerDependencies = [ ]; passthru.names = [ "xml2js" ]; }; - full."xml2js"."0.2.x" = lib.makeOverridable self.buildNodePackage { + by-spec."xml2js"."0.2.x" = + self.by-version."xml2js"."0.2.8"; + by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage { name = "xml2js-0.2.8"; src = [ (fetchurl { @@ -15365,32 +12485,19 @@ }) ]; buildInputs = - (self.nativeDeps."xml2js"."0.2.x" or []); + (self.nativeDeps."xml2js" or []); deps = [ - self.full."sax"."0.5.x" + self.by-version."sax"."0.5.5" ]; peerDependencies = [ ]; passthru.names = [ "xml2js" ]; }; - full."xml2js".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "xml2js-0.2.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; - sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; - }) - ]; - buildInputs = - (self.nativeDeps."xml2js".">= 0.0.1" or []); - deps = [ - self.full."sax"."0.5.x" - ]; - peerDependencies = [ - ]; - passthru.names = [ "xml2js" ]; - }; - full."xmlbuilder"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."xml2js".">= 0.0.1" = + self.by-version."xml2js"."0.2.8"; + by-spec."xmlbuilder"."*" = + self.by-version."xmlbuilder"."0.4.2"; + by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "xmlbuilder-0.4.2"; src = [ (fetchurl { @@ -15399,30 +12506,18 @@ }) ]; buildInputs = - (self.nativeDeps."xmlbuilder"."*" or []); + (self.nativeDeps."xmlbuilder" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "xmlbuilder" ]; }; - full."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "xmlbuilder-0.4.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; - sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; - }) - ]; - buildInputs = - (self.nativeDeps."xmlbuilder"."0.4.2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "xmlbuilder" ]; - }; - full."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { + by-spec."xmlbuilder"."0.4.2" = + self.by-version."xmlbuilder"."0.4.2"; + by-spec."xmlhttprequest"."1.4.2" = + self.by-version."xmlhttprequest"."1.4.2"; + by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { name = "xmlhttprequest-1.4.2"; src = [ (fetchurl { @@ -15431,14 +12526,16 @@ }) ]; buildInputs = - (self.nativeDeps."xmlhttprequest"."1.4.2" or []); + (self.nativeDeps."xmlhttprequest" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "xmlhttprequest" ]; }; - full."xoauth2"."~0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."xoauth2"."~0.1" = + self.by-version."xoauth2"."0.1.8"; + by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage { name = "xoauth2-0.1.8"; src = [ (fetchurl { @@ -15447,14 +12544,16 @@ }) ]; buildInputs = - (self.nativeDeps."xoauth2"."~0.1" or []); + (self.nativeDeps."xoauth2" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "xoauth2" ]; }; - full."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { + by-spec."yaml"."0.2.3" = + self.by-version."yaml"."0.2.3"; + by-version."yaml"."0.2.3" = lib.makeOverridable self.buildNodePackage { name = "yaml-0.2.3"; src = [ (fetchurl { @@ -15463,30 +12562,16 @@ }) ]; buildInputs = - (self.nativeDeps."yaml"."0.2.3" or []); + (self.nativeDeps."yaml" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "yaml" ]; }; - full."ycssmin".">=1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "ycssmin-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ycssmin/-/ycssmin-1.0.1.tgz"; - sha1 = "7cdde8db78cfab00d2901c3b2301e304faf4df16"; - }) - ]; - buildInputs = - (self.nativeDeps."ycssmin".">=1.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ycssmin" ]; - }; - full."yeoman-generator"."~0.10.0" = lib.makeOverridable self.buildNodePackage { + by-spec."yeoman-generator"."~0.10.0" = + self.by-version."yeoman-generator"."0.10.5"; + by-version."yeoman-generator"."0.10.5" = lib.makeOverridable self.buildNodePackage { name = "yeoman-generator-0.10.5"; src = [ (fetchurl { @@ -15495,29 +12580,31 @@ }) ]; buildInputs = - (self.nativeDeps."yeoman-generator"."~0.10.0" or []); + (self.nativeDeps."yeoman-generator" or []); deps = [ - self.full."cheerio"."~0.10.8" - self.full."request"."~2.16.6" - self.full."rimraf"."~2.1.4" - self.full."tar"."~0.1.17" - self.full."diff"."~1.0.4" - self.full."mime"."~1.2.9" - self.full."underscore.string"."~2.3.1" - self.full."lodash"."~1.1.1" - self.full."mkdirp"."~0.3.5" - self.full."read"."~1.0.4" - self.full."glob"."~3.1.21" - self.full."nopt"."~2.1.1" - self.full."cli-table"."~0.2.0" - self.full."debug"."~0.7.2" - self.full."isbinaryfile"."~0.1.8" + self.by-version."cheerio"."0.10.8" + self.by-version."request"."2.16.6" + self.by-version."rimraf"."2.1.4" + self.by-version."tar"."0.1.18" + self.by-version."diff"."1.0.7" + self.by-version."mime"."1.2.11" + self.by-version."underscore.string"."2.3.3" + self.by-version."lodash"."1.1.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."read"."1.0.5" + self.by-version."glob"."3.1.21" + self.by-version."nopt"."2.1.2" + self.by-version."cli-table"."0.2.0" + self.by-version."debug"."0.7.3" + self.by-version."isbinaryfile"."0.1.9" ]; peerDependencies = [ ]; passthru.names = [ "yeoman-generator" ]; }; - full."yeoman-generator"."~0.13.0" = lib.makeOverridable self.buildNodePackage { + by-spec."yeoman-generator"."~0.13.0" = + self.by-version."yeoman-generator"."0.13.4"; + by-version."yeoman-generator"."0.13.4" = lib.makeOverridable self.buildNodePackage { name = "yeoman-generator-0.13.4"; src = [ (fetchurl { @@ -15526,106 +12613,40 @@ }) ]; buildInputs = - (self.nativeDeps."yeoman-generator"."~0.13.0" or []); + (self.nativeDeps."yeoman-generator" or []); deps = [ - self.full."cheerio"."~0.12.0" - self.full."request"."~2.25.0" - self.full."rimraf"."~2.2.0" - self.full."tar"."~0.1.17" - self.full."diff"."~1.0.4" - self.full."mime"."~1.2.9" - self.full."underscore.string"."~2.3.1" - self.full."lodash"."~1.3.0" - self.full."mkdirp"."~0.3.5" - self.full."glob"."~3.2.0" - self.full."debug"."~0.7.2" - self.full."isbinaryfile"."~0.1.8" - self.full."dargs"."~0.1.0" - self.full."async"."~0.2.8" - self.full."inquirer"."~0.3.1" - self.full."iconv-lite"."~0.2.10" - self.full."shelljs"."~0.1.4" - self.full."findup-sync"."~0.1.2" - self.full."chalk"."~0.2.0" - self.full."text-table"."~0.1.1" + self.by-version."cheerio"."0.12.3" + self.by-version."request"."2.25.0" + self.by-version."rimraf"."2.2.2" + self.by-version."tar"."0.1.18" + self.by-version."diff"."1.0.7" + 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.6" + self.by-version."debug"."0.7.3" + self.by-version."isbinaryfile"."0.1.9" + self.by-version."dargs"."0.1.0" + self.by-version."async"."0.2.9" + 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" ]; }; - full."yeoman-generator"."~0.13.1" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.13.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; - sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator"."~0.13.1" or []); - deps = [ - self.full."cheerio"."~0.12.0" - self.full."request"."~2.25.0" - self.full."rimraf"."~2.2.0" - self.full."tar"."~0.1.17" - self.full."diff"."~1.0.4" - self.full."mime"."~1.2.9" - self.full."underscore.string"."~2.3.1" - self.full."lodash"."~1.3.0" - self.full."mkdirp"."~0.3.5" - self.full."glob"."~3.2.0" - self.full."debug"."~0.7.2" - self.full."isbinaryfile"."~0.1.8" - self.full."dargs"."~0.1.0" - self.full."async"."~0.2.8" - self.full."inquirer"."~0.3.1" - self.full."iconv-lite"."~0.2.10" - self.full."shelljs"."~0.1.4" - self.full."findup-sync"."~0.1.2" - self.full."chalk"."~0.2.0" - self.full."text-table"."~0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yeoman-generator" ]; - }; - full."yeoman-generator"."~0.13.2" = lib.makeOverridable self.buildNodePackage { - name = "yeoman-generator-0.13.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.13.4.tgz"; - sha1 = "066798dd978026d37be6657b2672a17bc4f4ce34"; - }) - ]; - buildInputs = - (self.nativeDeps."yeoman-generator"."~0.13.2" or []); - deps = [ - self.full."cheerio"."~0.12.0" - self.full."request"."~2.25.0" - self.full."rimraf"."~2.2.0" - self.full."tar"."~0.1.17" - self.full."diff"."~1.0.4" - self.full."mime"."~1.2.9" - self.full."underscore.string"."~2.3.1" - self.full."lodash"."~1.3.0" - self.full."mkdirp"."~0.3.5" - self.full."glob"."~3.2.0" - self.full."debug"."~0.7.2" - self.full."isbinaryfile"."~0.1.8" - self.full."dargs"."~0.1.0" - self.full."async"."~0.2.8" - self.full."inquirer"."~0.3.1" - self.full."iconv-lite"."~0.2.10" - self.full."shelljs"."~0.1.4" - self.full."findup-sync"."~0.1.2" - self.full."chalk"."~0.2.0" - self.full."text-table"."~0.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "yeoman-generator" ]; - }; - full."yo"."*" = lib.makeOverridable self.buildNodePackage { + by-spec."yeoman-generator"."~0.13.1" = + self.by-version."yeoman-generator"."0.13.4"; + by-spec."yeoman-generator"."~0.13.2" = + self.by-version."yeoman-generator"."0.13.4"; + by-spec."yo"."*" = + self.by-version."yo"."1.0.4"; + by-version."yo"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "yo-1.0.4"; src = [ (fetchurl { @@ -15634,53 +12655,30 @@ }) ]; buildInputs = - (self.nativeDeps."yo"."*" or []); + (self.nativeDeps."yo" or []); deps = [ - self.full."yeoman-generator"."~0.13.2" - self.full."nopt"."~2.1.1" - self.full."lodash"."~1.3.1" - self.full."update-notifier"."~0.1.3" - self.full."insight"."~0.2.0" - self.full."sudo-block"."~0.2.0" - self.full."async"."~0.2.9" - self.full."open"."0.0.4" - self.full."chalk"."~0.2.0" + self.by-version."yeoman-generator"."0.13.4" + self.by-version."nopt"."2.1.2" + self.by-version."lodash"."1.3.1" + self.by-version."update-notifier"."0.1.7" + self.by-version."insight"."0.2.0" + self.by-version."sudo-block"."0.2.1" + self.by-version."async"."0.2.9" + self.by-version."open"."0.0.4" + self.by-version."chalk"."0.2.1" ]; peerDependencies = [ - self.full."grunt-cli"."~0.1.7" - self.full."bower".">=0.9.0" + self.by-version."grunt-cli"."0.1.10" + self.by-version."bower"."1.2.7" ]; passthru.names = [ "yo" ]; }; - "yo" = self.full."yo"."*"; - full."yo".">=1.0.0-rc.1.1" = lib.makeOverridable self.buildNodePackage { - name = "yo-1.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yo/-/yo-1.0.4.tgz"; - sha1 = "666b5965a8e920df877d351da793f89bd1c8707a"; - }) - ]; - buildInputs = - (self.nativeDeps."yo".">=1.0.0-rc.1.1" or []); - deps = [ - self.full."yeoman-generator"."~0.13.2" - self.full."nopt"."~2.1.1" - self.full."lodash"."~1.3.1" - self.full."update-notifier"."~0.1.3" - self.full."insight"."~0.2.0" - self.full."sudo-block"."~0.2.0" - self.full."async"."~0.2.9" - self.full."open"."0.0.4" - self.full."chalk"."~0.2.0" - ]; - peerDependencies = [ - self.full."grunt-cli"."~0.1.7" - self.full."bower".">=0.9.0" - ]; - passthru.names = [ "yo" ]; - }; - full."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { + "yo" = self.by-version."yo"."1.0.4"; + by-spec."yo".">=1.0.0-rc.1.1" = + self.by-version."yo"."1.0.4"; + by-spec."zeparser"."0.0.5" = + self.by-version."zeparser"."0.0.5"; + by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage { name = "zeparser-0.0.5"; src = [ (fetchurl { @@ -15689,14 +12687,16 @@ }) ]; buildInputs = - (self.nativeDeps."zeparser"."0.0.5" or []); + (self.nativeDeps."zeparser" or []); deps = [ ]; peerDependencies = [ ]; passthru.names = [ "zeparser" ]; }; - full."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { + by-spec."zlib-browserify"."0.0.1" = + self.by-version."zlib-browserify"."0.0.1"; + by-version."zlib-browserify"."0.0.1" = lib.makeOverridable self.buildNodePackage { name = "zlib-browserify-0.0.1"; src = [ (fetchurl { @@ -15705,7 +12705,7 @@ }) ]; buildInputs = - (self.nativeDeps."zlib-browserify"."0.0.1" or []); + (self.nativeDeps."zlib-browserify" or []); deps = [ ]; peerDependencies = [ diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 8725ce1e9cd7..dcc024c7c5d6 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -2,9 +2,9 @@ { nativeDeps = { - "node-expat"."*" = [ pkgs.expat ]; - "rbytes"."*" = [ pkgs.openssl ]; - "phantomjs"."~1.9" = [ pkgs.phantomjs ]; + "node-expat" = [ pkgs.expat ]; + "rbytes" = [ pkgs.openssl ]; + "phantomjs" = [ pkgs.phantomjs ]; }; buildNodePackage = import ../development/web/nodejs/build-node-package.nix { From aa0f21e621910b5b9b4e647d5a3b36efa443eef7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 6 Nov 2013 01:13:23 +0100 Subject: [PATCH 077/760] pythonPackages: Add ipaddr, Google's IP address manipulation library --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0ff73db94c9..c0854b6dcd32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2908,6 +2908,24 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + + ipaddr = buildPythonPackage { + name = "ipaddr-2.1.7"; + src = fetchurl { + url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.7.tar.gz"; + md5 = "71a2be9f1d528d9a945ef555de312685"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "Google's IP address manipulation library"; + homepage = http://code.google.com/p/ipaddr-py/; + license = pkgs.lib.licenses.asl20; + }; + }; + ipdb = buildPythonPackage { name = "ipdb-0.7"; src = fetchurl { From c8bb648f0f24ef891e9dead07b9bc6ff46929416 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 6 Nov 2013 11:27:06 +0400 Subject: [PATCH 078/760] qvim: clean up the code --- pkgs/applications/editors/vim/qvim.nix | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 85c177f31bce..ca8e71fc58f4 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -19,17 +19,8 @@ composableDerivation { sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; }; + # FIXME: adopt Darwin fixes from vim/default.nix preConfigure = assert (! stdenv.isDarwin); ""; - # # if darwin support is enabled, we want to make sure we're not building with - # # OS-installed python framework - # preConfigure - # = stdenv.lib.optionalString - # (stdenv.isDarwin && (config.vim.darwin or true)) '' - # # TODO: we should find a better way of doing this as, if the configure - # # file changes, we need to change these line numbers - # sed -i "5641,5644d" src/auto/configure - # sed -i "5648d" src/auto/configure - # ''; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; @@ -37,16 +28,6 @@ composableDerivation { = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE qt4]; - # prePatch = "cd src"; - - # patches = - # [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 - # ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 - # ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 - # ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 - # ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 - # ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; - # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { From cadd2132302637dcfed9db43b2a31b980399e011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 5 Nov 2013 14:44:54 +0100 Subject: [PATCH 079/760] Making mupdf build in 'release', not 'debug'. --- pkgs/applications/misc/mupdf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 220309a8e221..17b86910de07 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -10,8 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; + enableParallelBuilding = true; + preBuild = '' - export makeFlags="prefix=$out" + export makeFlags="prefix=$out build=release" export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " ''; From cfe5f74e884a4f3beaaf642d713bf7d1b53832a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 6 Nov 2013 10:09:08 +0100 Subject: [PATCH 080/760] Updating poppler to 0.24.3. --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9cd094855d24..c438849e0cdb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.24.1"; # even major numbers are stable - sha256 = "1ipzirrh5ppkq99zb59xpfg5j2fgc8mr569r1cmxjjqql0dc1vsw"; + version = "0.24.3"; # even major numbers are stable + sha256 = "0kip6mxp4lscr3wvgfashqk7ymhx2w1hgdilfpgig0a5kr805kfj"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.22 From 07ccfe6af87d05c372b10b730f9ee799305d86dc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 10:29:27 +0100 Subject: [PATCH 081/760] linux: Update to 3.4.68 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 47393b0ae744..5b0fa29d1524 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.67"; + version = "3.4.68"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ndzlwhxvlm4lr86240h3ysxhmdkgdcp0n6qhid5nwrmxf5fpb1d"; + sha256 = "0z1gbz13px37ny7652cy1s5az5g6yh3bnz4zayab72rzmhgbpsyh"; }; features.iwlwifi = true; From 5098d53db14061c7918ff0b136e1eeb80b40e9e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 10:31:53 +0100 Subject: [PATCH 082/760] linux: Update to 3.10.18 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 65660619857b..84d3f64cf2c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.15"; + version = "3.10.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07wjh58sylbbw9hwxd5xvbz3dxd05iar8ahzk90lki38m5157ffk"; + sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd"; }; features.iwlwifi = true; From 77dc219127e98b8f4424f24cddde18d2b9fcd419 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 10:41:02 +0100 Subject: [PATCH 083/760] gcc: Support FreeBSD --- pkgs/development/compilers/gcc/4.6/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index faa5bba5e4a7..d7d9325ca4f8 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -462,7 +462,10 @@ stdenv.mkDerivation ({ # Volunteers needed for the {Cyg,Dar}win ports of *PPL. # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). - platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) stdenv.lib.platforms.darwin; + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; }; } From 25ca1c30e28f076685ce49ab83d3438ba1cdf24f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 10:47:58 +0100 Subject: [PATCH 084/760] screen: Only depend on PAM on Linux --- pkgs/tools/misc/screen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index c2c0a5aa534f..7dd04d251202 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pam }: +{ stdenv, fetchurl, ncurses, pam ? null }: stdenv.mkDerivation rec { name = "screen-4.0.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - buildInputs = [ ncurses pam ]; + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam; doCheck = true; From 58af4fb11e38eaf234b39f575f31d0db5dde6c4c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 10:58:20 +0100 Subject: [PATCH 085/760] Update some more platforms --- pkgs/development/libraries/atk/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 +--- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/tools/misc/intltool/default.nix | 2 +- pkgs/top-level/release.nix | 2 -- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 0c9e998ed2e1..b1e8a0080298 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 6ad30f66e03c..52d50369dc7d 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -24,10 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for image loading and manipulation"; - homepage = http://library.gnome.org/devel/gdk-pixbuf/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 59151d35326d..47b48bd979fa 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -173,6 +173,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; maintainers = with maintainers; [ lovek323 phreedom sander urkud ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index b2a400a61891..c9bb661935a4 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { homepage = "http://launchpad.net/intltool/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; inherit (s) version; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7fa545a8f6df..cc62eaec86d4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -140,7 +140,6 @@ let gphoto2 = linux; gpm = linux; gprolog = linux; - gpsbabel = all; gpscorrelate = linux; gpsd = linux; gqview = gtkSupported; @@ -212,7 +211,6 @@ let mysql = linux; mysql51 = linux; mysql55 = linux; - namazu = all; nano = allBut "i686-cygwin"; ncat = linux; netcat = all; From 1a4233d440c2af99d2b2c50ed7fac937b0318e8f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 6 Nov 2013 14:22:48 +0100 Subject: [PATCH 086/760] Bump dysnomia to latest development version --- .../package-management/disnix/dysnomia/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index de3690e3e203..2a5852863f96 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -7,6 +7,7 @@ , enablePostgreSQLDatabase ? false , enableSubversionRepository ? false , enableTomcatWebApplication ? false +, enableMongoDatabase ? false , catalinaBaseDir ? "/var/tomcat" }: @@ -14,12 +15,13 @@ assert enableMySQLDatabase -> mysql != null; assert enablePostgreSQLDatabase -> postgresql != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; +assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; + name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484"; src = fetchurl { - url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; - sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; + url = http://hydra.nixos.org/build/6763096/download/1/dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484.tar.gz; + sha256 = "0k7qpqa9inzxjdryd7zfzxid8k1icsxxw995chzw4wrlgxns16xy"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -32,13 +34,15 @@ stdenv.mkDerivation { ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} + ${if enableMongoDatabase then "--with-mongodb" else "--without-mongodb"} ''; buildInputs = [] ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion; + ++ stdenv.lib.optional enableSubversionRepository subversion + ++ stdenv.lib.optional enableMongoDatabase mongodb; meta = { description = "Automated deployment of mutable components and services for Disnix"; From ac0019dc18bfcbdc764df1f87acb8ab4b35682ab Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 5 Nov 2013 13:00:33 +0400 Subject: [PATCH 087/760] Fix remmina the FreeRDP GUI frontend The patch fixes [undefined reference to `g_thread_init'] as suggested by http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html --- .../networking/remote/remmina/default.nix | 2 ++ .../networking/remote/remmina/lgthread.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/networking/remote/remmina/lgthread.patch diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index b2b24a2565c6..a3cffd51d94b 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; + patches = [ ./lgthread.patch ]; + postInstall = '' wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch new file mode 100644 index 000000000000..2d8e60f75726 --- /dev/null +++ b/pkgs/applications/networking/remote/remmina/lgthread.patch @@ -0,0 +1,16 @@ +Fix [undefined reference to `g_thread_init'] as suggested by +http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html + +diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt +--- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400 ++++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400 +@@ -132,6 +132,8 @@ + endif() + endif() + ++set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" ) ++ + add_subdirectory(po) + add_subdirectory(icons) + add_subdirectory(desktop) + From 82dedd9cada0f7fd607b8bf9de30051510704a22 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 5 Nov 2013 15:47:30 +0400 Subject: [PATCH 088/760] Fix remmina: add Desktop file and icons --- .../networking/remote/remmina/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a3cffd51d94b..0d7092280da2 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,8 +1,21 @@ { stdenv, fetchurl, cmake, pkgconfig, makeWrapper , glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 -, freerdp, libssh, libgcrypt, gnutls }: +, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: -let version = "1.0.0"; in +let + version = "1.0.0"; + + desktopItem = makeDesktopItem { + name = "remmina"; + desktopName = "Remmina"; + genericName = "Remmina Remote Desktop Client"; + exec = "remmina"; + icon = "remmina"; + comment = "Connect to remote desktops"; + categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; + }; + +in stdenv.mkDerivation { name = "remmina-${version}"; @@ -21,6 +34,10 @@ stdenv.mkDerivation { patches = [ ./lgthread.patch ]; postInstall = '' + mkdir -pv $out/share/applications + mkdir -pv $out/share/icons + cp ${desktopItem}/share/applications/* $out/share/applications + cp -r $out/share/remmina/icons/* $out/share/icons wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; From b81caba5fbb49012a5cabefb672f3b83bd524d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Wed, 6 Nov 2013 23:17:46 +0100 Subject: [PATCH 089/760] SDL2: some improvements to the expression. Based on comments in the pull request from @edolstra and @peti. I also added missing metadata, setting myself as maintainer. --- pkgs/development/libraries/SDL2/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 8da6fefd1aa4..c3b33dfaf620 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -15,10 +15,8 @@ assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> pulseaudio != null; let - # force enable-static, to workaround this bug: - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 configureFlagsFun = attrs: '' - --enable-static --disable-oss --disable-x11-shared + --disable-oss --disable-x11-shared --disable-pulseaudio-shared --disable-alsa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; @@ -39,6 +37,9 @@ stdenv.mkDerivation rec { stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional alsaSupport alsaLib; + # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + dontDisableStatic = true; + # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems # to fail at doing this, hence `--disable-pulseaudio-shared'. @@ -48,10 +49,17 @@ stdenv.mkDerivation rec { configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; }; + postInstall = '' + rm $out/lib/*.a + ''; + passthru = {inherit openglSupport;}; meta = { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.page ]; }; } From 0eeee298ef06d28ab428aaa0b7c12d0188f1d421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 2 Nov 2013 11:53:04 +0100 Subject: [PATCH 090/760] perl: avoid --no-cpp-precomp on darwin, (close #1160) Taken from https://trac.macports.org/ticket/38913 vcunat renamed the patch Conflicts (trivial): pkgs/development/interpreters/perl/5.16/default.nix --- .../interpreters/perl/5.16/cpp-precomp.patch | 11 +++++++++++ pkgs/development/interpreters/perl/5.16/default.nix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/perl/5.16/cpp-precomp.patch diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch new file mode 100644 index 000000000000..231853fe51a6 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch @@ -0,0 +1,11 @@ +--- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 ++++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 +@@ -129,7 +129,7 @@ + + # Avoid Apple's cpp precompiler, better for extensions + if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then +- cppflags="${cppflags} -no-cpp-precomp" ++ #cppflags="${cppflags} -no-cpp-precomp" + + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 2113faee1640..a3ab0ef4b96f 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch ] - ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch; + ++ stdenv.lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under From 1be6aae4b4a26ac6f06c764f076bd57206e6fded Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sun, 3 Nov 2013 16:35:56 +0000 Subject: [PATCH 091/760] darwin x11/opengl: only copy subset of files (close #1165) Copy only the pc files related to X11 and OpenGL. This should allow us to build our own version of libraries like cairo without having the native ones be accidentally dynamically linked in to things that depend on them. Before this patch if we `dyldinfo -dylibs libpangocairo` we can see that it was dynamically linked against the OS X (but seemingly built against include files from the nix one, as we would get a runtime complaint about missing symbols) --- pkgs/os-specific/darwin/native-x11-and-opengl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix index cee03741dce6..3844912f6ba3 100644 --- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix +++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { builder = writeScript "${name}-builder.sh" '' /bin/mkdir -p $out - /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + /bin/mkdir $out/lib + /bin/ln -sv /usr/X11/lib/{*.dylib,X11,xorg} $out/lib + /bin/mkdir $out/lib/pkgconfig + /bin/ln -sv /usr/X11/lib/pkgconfig/{x*.pc,gl*.pc} $out/lib/pkgconfig + /bin/ln -sv /usr/X11/{bin,include,share} $out/ ''; } From 775b1bd4df5dfaba7dd8586487e8aed00a6fb216 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Nov 2013 10:42:13 +0100 Subject: [PATCH 092/760] Bump version of development Disnix --- pkgs/tools/package-management/disnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 62a644e195aa..e15419dfefb8 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef"; + name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea"; src = fetchurl { - url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz; + url = http://hydra.nixos.org/build/6763179/download/4/disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea.tar.gz; sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; }; From d31b328d0ad5729aed55a99d72bec786720359aa Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Nov 2013 10:54:53 +0100 Subject: [PATCH 093/760] Updated Disnix service definition to support new development version and mongo databases --- nixos/modules/services/misc/disnix.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 6419e6f8fc7b..72b98d1f84a5 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -15,6 +15,7 @@ let enablePostgreSQLDatabase = config.services.postgresql.enable; enableSubversionRepository = config.services.svnserve.enable; enableTomcatWebApplication = config.services.tomcat.enable; + enableMongoDatabase = config.services.mongodb.enable; }); in @@ -125,17 +126,18 @@ in ++ optional config.services.httpd.enable "httpd.service" ++ optional config.services.mysql.enable "mysql.service" ++ optional config.services.tomcat.enable "tomcat.service" - ++ optional config.services.svnserve.enable "svnserve.service"; + ++ optional config.services.svnserve.enable "svnserve.service" + ++ optional config.services.mongodb.enable "mongodb.service"; restartIfChanged = false; - path = [ pkgs.nix pkgs.disnix ]; - - script = - '' - export HOME=/root - disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia - ''; + path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ]; + + environment = { + HOME = "/root"; + }; + + exec = "disnix-service"; }; } // optionalAttrs cfg.publishAvahi { disnixAvahi = From db2075b6d826bd92d2187d2e641707dccc9ad96a Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Thu, 7 Nov 2013 11:05:13 +0100 Subject: [PATCH 094/760] Added milkytracker: Compiles and runs. --- lib/maintainers.nix | 1 + pkgs/applications/audio/milkytracker/default.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 06c71b2b7ac8..25545fae65d5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -62,4 +62,5 @@ winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; + zoomulator = "Kim Simmons "; } diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 8cbf85306b66..df62fb0ab0da 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { description = "Music tracker application, similar to Fasttracker II."; homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.zoomulator ]; }; } From 50a2f3fdce2cf89fc4c6e84a422a18cef3362937 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 7 Nov 2013 11:25:14 +0100 Subject: [PATCH 095/760] nixos/mongodb: set static uid to work with #1076 --- nixos/modules/misc/ids.nix | 1 + nixos/modules/services/databases/mongodb.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3edc9dda6b6..73134414138b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -106,6 +106,7 @@ firebird = 95; redis = 96; haproxy = 97; + mongodb = 98; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index d62994158939..213a60687b23 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -90,8 +90,9 @@ in config = mkIf config.services.mongodb.enable { - users.extraUsers = singleton - { name = cfg.user; + users.extraUsers.mongodb = mkIf (cfg.user == "mongodb") + { name = "mongodb"; + uid = config.ids.uids.mongodb; description = "MongoDB server user"; }; From 890b706df55aa32b20ce3c77ebae11e41cddb342 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Nov 2013 11:33:23 +0100 Subject: [PATCH 096/760] Fix sha256 hash of disnix --- pkgs/tools/package-management/disnix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index e15419dfefb8..f2c3a9c640ed 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://hydra.nixos.org/build/6763179/download/4/disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea.tar.gz; - sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; + sha256 = "0zmsaz1kvc7dl1igh6z74jxy3w5p2zbfm9jsczdjdh3947fkni4p"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; From 38f85ac5aee87e17aa9d3999afe024c1e95a6a7f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 7 Nov 2013 11:41:38 +0100 Subject: [PATCH 097/760] flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabilities) Fixes CVE-2013-3361, CVE-2013-3362, CVE-2013-3363 and CVE-2013-5324. --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 0363176257fd..d4d95f7e5b99 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,9 +44,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.297"; + version = "11.2.202.310"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8"; + sha256 = "03r9r7h3l4i15hw62k9il6pjzq122nldbgxr37b4y10xp08a9izj"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +55,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.297"; + version = "11.2.202.310"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y"; + sha256 = "0qf09p92silp81pjfcg2vcfcfi1padizmb58q5iaarnapgkawlbh"; } else throw "Flash Player is not supported on this platform"; From 89c566fcfd40a82a98d4e674e3aaa6d57d20cceb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 12:02:47 +0100 Subject: [PATCH 098/760] pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages Haskell packages -- i.e. packages built by our Cabal builder -- invariably have the attributes 'pname' and 'version'. We use the absence of these attributes to recognize non-Haskell packages and filter them from the closed package set generated by closePropagation. We do this so that the generated Haskell environment won't contain paths like "/lib/libz.a", which are part of the closure but have nothing to do with Haskell. The previous scheme used the attribute 'ghc' to accomplish the same thing, but unfortunately other packages to contain a 'ghc' attribute, too, like the old-style ghc-wrapper. Including the ghc-wrapper in this environment is pointless, obviously. The new approach filters the ghc-wrapper successfully. --- pkgs/development/compilers/ghc/with-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index b32b12d5b954..8f5e8616a84e 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -7,10 +7,11 @@ let packageDBFlag = if ghc761OrLater then "--package-db" else "--package-conf"; libDir = "$out/lib/ghc-${ghc.version}"; packageCfgDir = "${libDir}/package.conf.d"; + isHaskellPkg = x: (x ? pname) && (x ? version); in buildEnv { name = "haskell-env-${ghc.name}"; - paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation packages) ++ [ghc]; + paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook From f92a5cbfc61fe0778af7137afa6ae3cd79470180 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 12:09:38 +0100 Subject: [PATCH 099/760] pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter The ghcWithPackage expression now has an argument 'ignoreCollisions' that allows users to disable the path collision check like so: (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; }; See https://github.com/NixOS/nixpkgs/commit/d64917ad17277b8e16893ee31533ec2e33446fa7 for a long and detailed discussion of why these path collisions may occur. --- pkgs/development/compilers/ghc/with-packages.nix | 3 ++- pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 8f5e8616a84e..4508f0f529b5 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper }: +{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: assert packages != []; @@ -12,6 +12,7 @@ in buildEnv { name = "haskell-env-${ghc.name}"; paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; + inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d63b00dcc07..24bc93df8655 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -102,8 +102,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # argument to this function. ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix { - ghc = ghc; # refers to ghcPlain + ghc = ghc; # refers to ghcPlain packages = pkgs self; + ignoreCollisions = false; }; ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix { From 1e89c720e26a9443ce78cde227901da0e3a09598 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 12:26:38 +0100 Subject: [PATCH 100/760] Manual: Port forwarding to VMs --- nixos/doc/manual/installation.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 88ef589dd06a..70001577692e 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -369,9 +369,23 @@ $ nixos-rebuild build-vm $ ./result/bin/run-*-vm -The VM does not have use any data from your host system, so your -existing user accounts and home directories will not be -available. +The VM does not have any data from your host system, so your existing +user accounts and home directories will not be available. You can +forward ports on the host to the guest. For instance, the following +will forward host port 2222 to guest port 22 (SSH): + + +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm + + +allowing you to log in via SSH (assuming you have set the appropriate +passwords or SSH authorized keys): + + +$ ssh -p 2222 localhost + + + From dc9efcd02d0c661f702c2e87413688fd25b1e8fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 12:59:45 +0100 Subject: [PATCH 101/760] milkytracker: fix evaluation --- pkgs/applications/audio/milkytracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index df62fb0ab0da..965c941113c3 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.zoomulator ]; + maintainers = [ stdenv.lib.maintainers.zoomulator ]; }; } From 97ecf741811c586aabc4c8c5e2c1826cccf76399 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Nov 2013 13:58:47 +0100 Subject: [PATCH 102/760] disnix: add dysnomia as dependency --- pkgs/tools/package-management/disnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index f2c3a9c640ed..5c9120cf33ed 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0zmsaz1kvc7dl1igh6z74jxy3w5p2zbfm9jsczdjdh3947fkni4p"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ]; dontStrip = true; From b66a59bf41b97d0f5982e8cace60fda18c536563 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 13:02:13 +0100 Subject: [PATCH 103/760] haskell-uu-parsinglib: update to version 2.8.1.1 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 8d0b0bda23d2..2a115b8b217e 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.8.1"; - sha256 = "10phjwm8dm45rms2vfpx9vzm56v7b9wp0308xkfbalh5zbvxmv35"; + version = "2.8.1.1"; + sha256 = "1mz8sni7mj85b0ih0y1ld7lcj74iq5z2xi1lbwwndpqra9ahc5s6"; buildDepends = [ ListLike time uuInterleaved ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 46419ae45430992131c6b6c6189887eefa3bc77f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 13:59:44 +0100 Subject: [PATCH 104/760] python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment This patch means that adding 'matplotlib' to extraLibs will automatically include 'numpy', too, because matplotlib depends on it. --- pkgs/development/interpreters/python/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 1699690749f1..a749a82fc8ae 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -4,15 +4,17 @@ (buildEnv { name = "python-${python.version}-wrapper"; - paths = extraLibs ++ [ python makeWrapper recursivePthLoader ]; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; ignoreCollisions = false; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" + if [ -L "$out/bin" ]; then unlink "$out/bin" fi mkdir -p "$out/bin" + cd "${python}/bin" for prg in *; do echo "$prg --> $out/bin/$prg" From b53f71e7155a903e698c99a9fea9c191751d9bd7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 14:57:34 +0100 Subject: [PATCH 105/760] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75433c9034a..7c005947206e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1914,7 +1914,7 @@ let unoconv = callPackage ../tools/text/unoconv { }; upx = callPackage ../tools/compression/upx { }; - + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -9280,8 +9280,8 @@ let racer = callPackage ../games/racer { }; - residualvm = callPackage ../games/residualvm { - openglSupport = mesaSupported; + residualvm = callPackage ../games/residualvm { + openglSupport = mesaSupported; }; rigsofrods = callPackage ../games/rigsofrods { From 29588edfe1896d291257bf35e734ff197cd7971b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 15:13:02 +0100 Subject: [PATCH 106/760] python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step The default setting for extraLibs used to be the set of modules that come with python by default but aren't usually enabled in our standard python derivation because they require additional libraries. This meant that users who want to *add* libraries to that set had to use a fairly complicated override, to add more entries without loosing the ones set by default. After this patch, the "standard libraries" such as "curses' are listed in stdLibs while the extraLibs argument remains empty by default. This allows users to override extraLibs without overriding the standard libraries. Furthermore, the wrapper environment can be messed around with in an additional 'postBuild' step. One nice application of this build step is to patch scripts and binaries to use the wrapped python interpreter instead of the pristine one, thereby enabling them to pick up all modules that have been configured. The following example shows how this is done for the 'pylint' utility: pkgs.python27Full.override { extraLibs = [pkgs.pylint]; postBuild = '' cd ${pkgs.pylint}/bin for i in *; do rm $out/bin/$i sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i chmod +x $out/bin/$i done; ''; }; --- pkgs/development/interpreters/python/wrapper.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index a749a82fc8ae..34af23740d5d 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,10 +1,12 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [] }: +{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" +, stdLibs ? stdenv.lib.attrValues python.modules +}: # Create a python executable that knows about additional packages. (buildEnv { name = "python-${python.version}-wrapper"; - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; ignoreCollisions = false; postBuild = '' @@ -17,11 +19,10 @@ cd "${python}/bin" for prg in *; do - echo "$prg --> $out/bin/$prg" rm -f "$out/bin/$prg" makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" done - ''; + '' + postBuild; }) // { inherit python; inherit (python) meta; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c005947206e..070abb403239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,12 +3236,14 @@ let pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = lib.attrValues python26.modules; + extraLibs = []; + postBuild = ""; python = python26; inherit (python26Packages) recursivePthLoader; }; python27Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = lib.attrValues python27.modules; + extraLibs = []; + postBuild = ""; python = python27; inherit (python27Packages) recursivePthLoader; }; From 0d5ec076d2c466d216d5fa2634973368515cb54d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 15:38:18 +0100 Subject: [PATCH 107/760] Use default kernel for EFI-related stuff --- nixos/modules/installer/tools/nixos-generate-config.pl | 3 --- nixos/tests/efi-installer.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 0f9142990ec1..6b42058a8926 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -386,9 +386,6 @@ if ($showHardwareConfig) { boot.loader.grub.enable = false; boot.loader.gummiboot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # !!! Remove this when nixos is on 3.10 or greater by default - # EFI booting requires kernel >= 3.10 - boot.kernelPackages = pkgs.linuxPackages_3_10; EOF } else { $bootLoaderConfig = < ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; boot.loader.grub.enable = false; boot.loader.efi.canTouchEfiVariables = true; boot.loader.gummiboot.enable = true; From 8c9c3b628f97f9d02b41090d129ba2bb1d05566b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 15:46:16 +0100 Subject: [PATCH 108/760] Drop the new-kernel ISOs --- nixos/release.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index 120b1289bd06..ff094cce05fa 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -123,11 +123,13 @@ in rec { inherit system; }); + /* iso_minimal_new_kernel = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; }); + */ iso_graphical = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; @@ -137,11 +139,13 @@ in rec { # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. + /* iso_new_kernel = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-new-kernel.nix; type = "new-kernel"; inherit system; }); + */ # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). From 10e31f6de73536ff545e1799ae72c9f2ab423202 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 16:14:59 +0100 Subject: [PATCH 109/760] Clean up the vsftpd module a bit --- nixos/modules/services/networking/vsftpd.nix | 117 ++++++++----------- pkgs/servers/ftp/vsftpd/default.nix | 27 +++-- 2 files changed, 64 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 0a6355e6ff17..e398230e1681 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -24,6 +24,7 @@ let cfgText = "${vsftpdName}=${if getAttr nixosName cfg then "YES" else "NO"}"; nixosOption = { + type = types.bool; name = nixosName; value = mkOption { inherit description default; @@ -33,27 +34,26 @@ let }; optionDescription = [ - (yesNoOption "anonymousUser" "anonymous_enable" false '' - Whether to enable the anonymous FTP user. + Whether to enable the anonymous FTP user. '') (yesNoOption "localUsers" "local_enable" false '' - Whether to enable FTP for local users. + Whether to enable FTP for local users. '') (yesNoOption "writeEnable" "write_enable" false '' - Whether any write activity is permitted to users. + Whether any write activity is permitted to users. '') (yesNoOption "anonymousUploadEnable" "anon_upload_enable" false '' - Whether any uploads are permitted to anonymous users. + Whether any uploads are permitted to anonymous users. '') (yesNoOption "anonymousMkdirEnable" "anon_mkdir_write_enable" false '' - Whether any uploads are permitted to anonymous users. + Whether any uploads are permitted to anonymous users. '') (yesNoOption "chrootlocalUser" "chroot_local_user" false '' - Whether local users are confined to their home directory. + Whether local users are confined to their home directory. '') (yesNoOption "userlistEnable" "userlist_enable" false '' - Whether users are included. + Whether users are included. '') (yesNoOption "userlistDeny" "userlist_deny" false '' Specifies whether is a list of user @@ -61,35 +61,33 @@ let The default false means whitelist/allow. '') (yesNoOption "forceLocalLoginsSSL" "force_local_logins_ssl" false '' - Only applies if is true. Non anonymous (local) users - must use a secure SSL connection to send a password. + Only applies if is true. Non anonymous (local) users + must use a secure SSL connection to send a password. '') (yesNoOption "forceLocalDataSSL" "force_local_data_ssl" false '' - Only applies if is true. Non anonymous (local) users - must use a secure SSL connection for sending/receiving data on data connection. + Only applies if is true. Non anonymous (local) users + must use a secure SSL connection for sending/receiving data on data connection. '') (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' '') (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' '') (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' '') + ]; - { - cfgText = if cfg.rsaCertFile == null then "" - else '' + configFile = pkgs.writeText "vsftpd.conf" + '' + ${concatMapStrings (x: "${x.cfgText}\n") optionDescription} + ${optionalString (cfg.rsaCertFile != null) '' ssl_enable=YES rsa_cert_file=${cfg.rsaCertFile} - ''; - - nixosOption = { - name = "rsaCertFile"; - value = mkOption { - default = null; - description = '' - rsa certificate file. - ''; - }; - }; - } - ]; + ''} + ${optionalString (cfg.userlistFile != null) '' + userlist_file=${cfg.userlistFile} + ''} + background=NO + listen=YES + nopriv_user=vsftpd + secure_chroot_dir=/var/empty + ''; in @@ -108,10 +106,7 @@ in userlist = mkOption { default = []; - - description = '' - See . - ''; + description = "See ."; }; userlistFile = mkOption { @@ -127,13 +122,20 @@ in }; anonymousUserHome = mkOption { + type = types.path; default = "/home/ftp/"; - description = '' - Directory to consider the HOME of the anonymous user. - ''; + description = '' + Directory to consider the HOME of the anonymous user. + ''; }; - } // (listToAttrs (catAttrs "nixosOption" optionDescription)) ; + rsaCertFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "RSA certificate file."; + }; + + } // (listToAttrs (catAttrs "nixosOption" optionDescription)); }; @@ -142,14 +144,12 @@ in config = mkIf cfg.enable { - assertions = [ - { - assertion = + assertions = singleton + { assertion = (cfg.forceLocalLoginsSSL -> cfg.rsaCertFile != null) && (cfg.forceLocalDataSSL -> cfg.rsaCertFile != null); message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; - } - ]; + }; users.extraUsers = [ { name = "vsftpd"; @@ -157,7 +157,7 @@ in description = "VSFTPD user"; home = "/homeless-shelter"; } - ] ++ pkgs.lib.optional cfg.anonymousUser + ] ++ optional cfg.anonymousUser { name = "ftp"; uid = config.ids.uids.ftp; group = "ftp"; @@ -165,41 +165,26 @@ in home = cfg.anonymousUserHome; }; - users.extraGroups = singleton - { name = "ftp"; - gid = config.ids.gids.ftp; - }; + users.extraGroups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny # = false and whitelist root services.vsftpd.userlist = if cfg.userlistDeny then ["root"] else []; - environment.etc."vsftpd.conf".text = - concatMapStrings (x: "${x.cfgText}\n") optionDescription - + '' - ${if cfg.userlistFile == null then "" - else "userlist_file=${cfg.userlistFile}"} - background=NO - listen=YES - nopriv_user=vsftpd - secure_chroot_dir=/var/empty - ''; + systemd.services.vsftpd = + { description = "Vsftpd Server"; - jobs.vsftpd = - { description = "vsftpd server"; - - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; + wantedBy = [ "multi-user.target" ]; preStart = - '' - ${if cfg.anonymousUser then '' + optionalString cfg.anonymousUser + '' mkdir -p -m 555 ${cfg.anonymousUserHome} chown -R ftp:ftp ${cfg.anonymousUserHome} - '' else ""} - ''; + ''; - exec = "${vsftpd}/sbin/vsftpd /etc/vsftpd.conf"; + serviceConfig.ExecStart = "@${vsftpd}/sbin/vsftpd vsftpd ${configFile}"; + serviceConfig.Restart = "always"; }; }; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 39b78958b031..3b9b32898e2f 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,23 +1,29 @@ { stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "vsftpd-3.0.2"; - + src = fetchurl { url = "https://security.appspot.com/downloads/${name}.tar.gz"; sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy"; }; + preConfigure = stdenv.lib.optionalString sslEnable '' + echo "Will enable SSL" + sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h + ''; + # The gcc-wrappers use -idirafter for glibc, and vsftpd also, and # their dummyinc come before those of glibc, then the build works bad. prePatch = '' sed -i -e 's/-idirafter.*//' Makefile ''; - - preBuild = let - sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else ""; + + preBuild = + let + sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto" else ""; in '' - makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" ) + makeFlagsArray=( "LIBS=${sslLibs} -lpam -lcap -fstack-protector" ) ''; # It won't link without this flag, used in CFLAGS @@ -35,11 +41,4 @@ stdenv.mkDerivation (rec { mkdir -pv $out/etc/xinetd.d install -v -m 644 xinetd.d/vsftpd $out/etc/xinetd.d/vsftpd ''; -} // (if sslEnable then { - preConfigure = '' - echo "Will enable SSL" - sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h - ''; - -} else { }) -) +} From 000962c3fb53dcbe07e365875623d2d19fb4cdf6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 16:18:24 +0100 Subject: [PATCH 110/760] vsftpd: Run in the background and log to syslog (i.e. journal) --- nixos/modules/services/networking/vsftpd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index e398230e1681..cfd8530717e3 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -83,10 +83,11 @@ let ${optionalString (cfg.userlistFile != null) '' userlist_file=${cfg.userlistFile} ''} - background=NO + background=YES listen=YES nopriv_user=vsftpd secure_chroot_dir=/var/empty + syslog_enable=YES ''; in @@ -185,6 +186,7 @@ in serviceConfig.ExecStart = "@${vsftpd}/sbin/vsftpd vsftpd ${configFile}"; serviceConfig.Restart = "always"; + serviceConfig.Type = "forking"; }; }; From cc65b1015d1bb8ef4028ff72d642bc264e4d0225 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Nov 2013 16:35:54 +0100 Subject: [PATCH 111/760] vsftpd: Disable seccomp filtering on 64-bit It worked on Linux 3.4 but fails with "500 OOPS: priv_sock_get_cmd" since we updated the default kernel to 3.10. http://hydra.nixos.org/build/6715359 https://bugzilla.redhat.com/show_bug.cgi?id=845980 https://bugzilla.novell.com/show_bug.cgi?id=786024 --- nixos/modules/services/networking/vsftpd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index cfd8530717e3..1c77cc6df4ea 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -88,6 +88,9 @@ let nopriv_user=vsftpd secure_chroot_dir=/var/empty syslog_enable=YES + ${optionalString (pkgs.stdenv.system == "x86_64-linux") '' + seccomp_sandbox=NO + ''} ''; in From 5bc317409f18501e7c26caab49a0e34632231ea9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Nov 2013 17:45:52 +0100 Subject: [PATCH 112/760] Bump disnixos to latest development version --- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 80ac91b54899..4c811dd3f71f 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz"; + name = "disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99"; src = fetchurl { - url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz; - sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z"; + url = http://hydra.nixos.org/build/6769017/download/3/disnixos-0.2prebb320d396f93d7062c28d6a54105d8e8196b9d99.tar.gz; + sha256 = "0jw05qjn0fbf4xb2g8a8i0padmsw17ayr4acw7z784bljrm1z055"; }; buildInputs = [ socat pkgconfig disnix ]; From 73847ca936d34def46b112cdff36acda10b2b570 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 8 Nov 2013 09:01:28 +0400 Subject: [PATCH 113/760] Add missing arguments to qvim --- needed to preserve the partial Darwin compatibility fixes inherited from main vim expression --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 070abb403239..2932c59b3eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8869,6 +8869,8 @@ let inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; + inherit (pkgs) stdenvAdapters gccApple; + features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; flags = [ "python" "X11" ]; # only flag "X11" by now From 139b10eb93768ad75b505754d46c359d29fb5f81 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 8 Nov 2013 12:19:01 +0400 Subject: [PATCH 114/760] qvim: fix stdenvAdapters issue --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30089eeb1645..9a9a531c07a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8893,6 +8893,8 @@ let features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; flags = [ "python" "X11" ]; # only flag "X11" by now + + inherit stdenvAdapters gccApple; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; From 2b1b4f3d3a3b48b05916da29e44ae78a4b1532c1 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 8 Nov 2013 12:23:04 +0400 Subject: [PATCH 115/760] qvim: chage platforms from 'unix' to 'linux' I have no Darwin machine available so lets test qvim on Linux for now --- pkgs/applications/editors/vim/qvim.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index ca8e71fc58f4..15a147319a15 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -19,7 +19,8 @@ composableDerivation { sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; }; - # FIXME: adopt Darwin fixes from vim/default.nix + # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux + # to meta.platforms.unix preConfigure = assert (! stdenv.isDarwin); ""; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; @@ -108,7 +109,7 @@ composableDerivation { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) From 0aedd883e83a9b5731091fd9598327b8bbfe27f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 8 Nov 2013 09:59:28 +0100 Subject: [PATCH 116/760] Adding qbittorrent --- .../networking/p2p/qbittorrent/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/p2p/qbittorrent/default.nix diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix new file mode 100644 index 000000000000..5aff37580d31 --- /dev/null +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qt4, which, dbus_libs, boost, libtorrentRasterbar +, pkgconfig }: + +stdenv.mkDerivation rec { + name = "qbittorrent-3.1.2"; + + src = fetchurl { + url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; + sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y"; + }; + + buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar + pkgconfig ]; + + configureFlags = "--with-libboost-inc=${boost}/include " + + "--with-libboost-lib=${boost}/lib"; + + enableParallelBuilding = true; + + meta = { + description = "Free Software alternative to µtorrent"; + homepage = http://www.qbittorrent.org/; + maintainers = with stdenv.lib.maintainers; [ viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2932c59b3eb9..674dd7dd9980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8515,6 +8515,8 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + qemu = callPackage ../applications/virtualization/qemu { }; qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; From 29b2aec2338b6375c12d89f63a530ebc5e6406b2 Mon Sep 17 00:00:00 2001 From: Eric Kow Date: Sat, 2 Nov 2013 14:10:23 +0000 Subject: [PATCH 117/760] wget darwin: disable Test-iri-disabled.px This test fails on MacOS X. The failure has something to do with the tests expecting filesystems to accept/store filenames as bytes. On the HFS+ filesystem, however, filenames are Unicode characters (Normalisation Form D). This wget ticket appears to be relevant http://savannah.gnu.org/bugs/index.php?27541 The maintainer does not seem to think that this test failure represents a problem in practice: http://article.gmane.org/gmane.comp.web.wget.general/8988 But this patch should be revisited/removed if this aspect of wget is ever addressed in the future. NB: I'm also a bit concerned/confused that none of the tests mentioned in that message seem to fail, so I'm not 100% sure if this is the relevant issue. --- pkgs/tools/networking/wget/default.nix | 2 ++ pkgs/tools/networking/wget/iri-test.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/networking/wget/iri-test.patch diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3e3b74dfe902..5ae85adbec7e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch; + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/iri-test.patch b/pkgs/tools/networking/wget/iri-test.patch new file mode 100644 index 000000000000..c1f798ce3726 --- /dev/null +++ b/pkgs/tools/networking/wget/iri-test.patch @@ -0,0 +1,12 @@ +diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px +--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100 ++++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000 +@@ -48,7 +48,7 @@ + 'Test-idn-robots-utf8.px', + 'Test-iri.px', + 'Test-iri-percent.px', +- 'Test-iri-disabled.px', ++ #'Test-iri-disabled.px', + 'Test-iri-forced-remote.px', + 'Test-iri-list.px', + 'Test-k.px', From 29d981d1bd2a1763593bac6fd08094b313d802e3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 8 Nov 2013 13:55:20 +0400 Subject: [PATCH 118/760] Oops, merged a double-fix --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ceca54ce82ee..674dd7dd9980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8876,8 +8876,6 @@ let features = "huge"; # one of tiny, small, normal, big or huge lua = pkgs.lua5; flags = [ "python" "X11" ]; # only flag "X11" by now - - inherit stdenvAdapters gccApple; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; From f3eccb26f7f11475400b5cc07425d87282a4ea18 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 7 Nov 2013 16:49:17 +0100 Subject: [PATCH 119/760] Fix test deployment in EC2 creation script --- nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 93971ac9504d..213e59423ac6 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -185,7 +185,7 @@ f.write( '''.format(args.region, ami_id, instance_type)) f.close() -test_depl = deployment.create_deployment(db) +test_depl = db.create_deployment() test_depl.auto_response = "y" test_depl.name = "ebs-creator-test" test_depl.nix_exprs = [os.path.abspath("./ebs-test.nix")] From e9921632efc6a81ff7b36fc93dc29da521324a33 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 8 Nov 2013 11:37:38 +0000 Subject: [PATCH 120/760] Updating EC2 EBS HVM creation script. * Use smaller instances to generate HVM images * Use HVM base image that has 4 ephemeral disks in device mapping * As grub is not on the base images anymore, install it first before copying parts of its contents --- nixos/maintainers/scripts/ec2/create-ebs-amis.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 213e59423ac6..2e7a3273118c 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -16,7 +16,7 @@ parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM i parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob") args = parser.parse_args() -instance_type = "cc1.4xlarge" if args.hvm else "m1.small" +instance_type = "m3.xlarge" if args.hvm else "m1.small" ebs_size = 8 if args.hvm else 20 @@ -72,7 +72,8 @@ print >> sys.stderr, "NixOS version is {0}".format(version) m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix") m.run_command("nixos-install") if args.hvm: - m.run_command('cp /mnt/nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub') + m.run_command('nix-env -iA nixos.pkgs.grub') + m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub') m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst') m.run_command('echo "(hd1) /dev/xvdg" > device.map') m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch') @@ -98,7 +99,7 @@ def check(): m.connect() volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m.resource_id, 'attachment.device': "/dev/sdg"})[0] if args.hvm: - instance = m._conn.run_instances( image_id="ami-6a9e4503" + instance = m._conn.run_instances( image_id="ami-5f491f36" , instance_type=instance_type , key_name=args.key_name , placement=m.zone From 001550d5fe4174d081430d0da3790a815192eff6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 8 Nov 2013 11:40:58 +0000 Subject: [PATCH 121/760] Adapt S3 ami creation script to new nixpkgs structure --- nixos/maintainers/scripts/ec2/create-s3-amis.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-s3-amis.sh b/nixos/maintainers/scripts/ec2/create-s3-amis.sh index 1aaac2832394..140b4fcbddb8 100755 --- a/nixos/maintainers/scripts/ec2/create-s3-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-s3-amis.sh @@ -1,9 +1,8 @@ #! /bin/sh -e -nixos=$(nix-instantiate --find-file nixos) export NIXOS_CONFIG=$(dirname $(readlink -f $0))/amazon-base-config.nix -version=$(nix-instantiate --eval-only '' -A config.system.nixosVersion | sed s/'"'//g) +version=$(nix-instantiate --eval-only '' -A config.system.nixosVersion | sed s/'"'//g) echo "NixOS version is $version" buildAndUploadFor() { @@ -11,13 +10,13 @@ buildAndUploadFor() { arch="$2" echo "building $system image..." - nix-build '' \ + nix-build '' \ -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \ -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY" - for region in eu-west-1 us-east-1 us-west-1 us-west-2; do + for region in eu-west-1; do echo "uploading $system image for $region..." name=nixos-$version-$arch-s3 From e62e15b2f977e37f109de305a78dda38afa0c6c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Nov 2013 16:35:23 +0100 Subject: [PATCH 122/760] Only run systemd-inhibit for local X11 sessions --- nixos/modules/services/x11/display-managers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c4fce3706dcd..80f559bddc4d 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -44,7 +44,9 @@ let # since presumably the desktop environment will handle these. if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then export _INHIBITION_LOCK_TAKEN=1 - exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType" + if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then + exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType" + fi fi ''} From 065493284f3d831b9ad8af6be8a7f781a7c11420 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Nov 2013 16:37:10 +0100 Subject: [PATCH 123/760] Update the X11 terminal server module for systemd Yay, we no longer need inetd! --- .../modules/services/x11/terminal-server.nix | 57 ++++++++++++------- pkgs/tools/X11/x11vnc/default.nix | 4 +- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index ab05639aeca6..72ecb8fe2fd7 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -17,27 +17,17 @@ let #! ${pkgs.stdenv.shell} export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri - exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir "${pkgs.xkeyboard_config}/etc/X11/xkb" + exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb ''; - # ‘xinetd’ is insanely braindamaged in that it sends stderr to - # stdout. Thus requires just about any xinetd program to be - # wrapped to redirect its stderr. Sigh. - x11vncWrapper = pkgs.writeScriptBin "x11vnc-wrapper" - '' - #! ${pkgs.stdenv.shell} - export PATH=${makeSearchPath "bin" [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]}:$PATH - export FD_GEOM=1024x786x24 - exec ${pkgs.x11vnc}/bin/x11vnc -inetd -display WAIT:1024x786:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw -ssl SAVE 2> /var/log/x11vnc.log - ''; - -in +in { config = { - + services.xserver.enable = true; + services.xserver.videoDrivers = []; # Enable KDM. Any display manager will do as long as it supports XDMCP. services.xserver.displayManager.kdm.enable = true; @@ -52,13 +42,38 @@ in Xaccess=${pkgs.writeText "Xaccess" "localhost"} ''; - services.xinetd.enable = true; - services.xinetd.services = singleton - { name = "x11vnc"; - port = 5900; - unlisted = true; - user = "root"; - server = "${x11vncWrapper}/bin/x11vnc-wrapper"; + networking.firewall.allowedTCPPorts = [ 5900 ]; + + systemd.sockets.terminal-server = + { description = "Terminal Server Socket"; + wantedBy = [ "sockets.target" ]; + before = [ "multi-user.target" ]; + socketConfig.Accept = true; + socketConfig.ListenStream = 5900; + }; + + systemd.services."terminal-server@" = + { description = "Terminal Server"; + + path = + [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash + ]; + + environment.FD_GEOM = "1024x786x24"; + environment.FD_XDMCP_IF = "127.0.0.1"; + #environment.FIND_DISPLAY_OUTPUT = "/tmp/foo"; # to debug the "find display" script + + serviceConfig = + { StandardInput = "socket"; + StandardOutput = "socket"; + StandardError = "journal"; + ExecStart = "@${pkgs.x11vnc}/bin/x11vnc x11vnc -inetd -display WAIT:1024x786:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw -ssl SAVE"; + # Don't kill the X server when the user quits the VNC + # connection. FIXME: the X server should run in a + # separate systemd session. + KillMode = "process"; + }; }; }; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 23b0aaa55e8e..8acb11833da5 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { substituteInPlace x11vnc/unixpw.c \ --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h + + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h ''; meta = { From 52ad0eaca5f5cbb01bf6689bbfc1001ebc62a4e7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Nov 2013 16:42:59 +0100 Subject: [PATCH 124/760] openssh: Security fix CVE-2013-4548 --- pkgs/tools/networking/openssh/default.nix | 2 +- pkgs/tools/networking/openssh/gcmrekey.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/openssh/gcmrekey.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 35586031ef55..7d2ae9c5bb4b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ]; + patches = [ ./locale_archive.patch ./gcmrekey.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ (if withKerberos then [ kerberos ] else []) diff --git a/pkgs/tools/networking/openssh/gcmrekey.patch b/pkgs/tools/networking/openssh/gcmrekey.patch new file mode 100644 index 000000000000..ddb694af1ddb --- /dev/null +++ b/pkgs/tools/networking/openssh/gcmrekey.patch @@ -0,0 +1,18 @@ +http://www.openssh.com/txt/gcmrekey.adv + +Index: monitor_wrap.c +=================================================================== +RCS file: /cvs/src/usr.bin/ssh/monitor_wrap.c,v +retrieving revision 1.76 +diff -u -p -u -r1.76 monitor_wrap.c +--- a/monitor_wrap.c 17 May 2013 00:13:13 -0000 1.76 ++++ b/monitor_wrap.c 6 Nov 2013 16:31:26 -0000 +@@ -469,7 +469,7 @@ mm_newkeys_from_blob(u_char *blob, int b + buffer_init(&b); + buffer_append(&b, blob, blen); + +- newkey = xmalloc(sizeof(*newkey)); ++ newkey = xcalloc(1, sizeof(*newkey)); + enc = &newkey->enc; + mac = &newkey->mac; + comp = &newkey->comp; From 9b35dac0c0e0364559a094313d0708f73abef055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 8 Nov 2013 16:02:51 +0100 Subject: [PATCH 125/760] iperf: 2.0.4 -> 2.0.5 --- pkgs/tools/networking/iperf/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index 66f600f76784..2ee8a90cb4af 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "iperf-2.0.4"; +stdenv.mkDerivation rec { + name = "iperf-2.0.5"; src = fetchurl { - url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz; - sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; + url = "mirror://sourceforge/iperf/${name}.tar.gz"; + sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3"; }; - meta = { - homepage = ""; - description = "tool to measure IP bandwidth using UDP or TCP"; + meta = with stdenv.lib; { + homepage = "http://sourceforge.net/projects/iperf/"; + description = "Tool to measure IP bandwidth using UDP or TCP"; + platforms = platforms.linux; license = "as-is"; }; } From 3e8e635be7d3a1f93812b6692169bf9ca115be58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 8 Nov 2013 17:27:57 +0100 Subject: [PATCH 126/760] Updating gdb to 7.6.1 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 4dd83f63c7dc..8df9f71c1816 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.6"; + basename = "gdb-7.6.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "fda57170e4d11cdde74259ca575412a8"; + md5 = "fbc4dab4181e6e9937075b43a4ce2732"; }; # I think python is not a native input, but I leave it From 698065715a0ea2c73495dac262e8ee95f05f63c3 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 8 Nov 2013 21:30:34 +0100 Subject: [PATCH 127/760] Leiningen: Update to 2.3.3 Signed-off-by: Moritz Ulrich --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index b16640105503..a41cf69ad238 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.3.2"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1dpvs6b2n309ixglmdpw64k8fbz8n4rd61xp4jrih0z7dgvcql6h"; + sha256 = "0lc5ivgknkflk6k4a4q1r8bm3kq63p4cazfs1rdb02cfhdip52hc"; }; jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "0g6sgmgl0azawwchi86qxqsknk753ffwiszsxg4idqb713ac6cda"; + sha256 = "1a8i0940ww7xqhwlaaavsgw8s9rjqdnv46hfsla41ns789bappxf"; }; patches = ./lein_2.3.0.patch; From 46646feb17e33bf65ea38830260577277fd4090d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 25 Aug 2013 21:19:21 +0200 Subject: [PATCH 128/760] sane: add support for Epson snapscan scanners The firmware file needs to be downloaded or extracted from the windows driver file and configured in nixpkgs.config e.g.: sane.snapscanFirmware = /firmware/esfw41.bin; --- pkgs/applications/graphics/sane/backends-git.nix | 7 ++++++- pkgs/applications/graphics/sane/backends.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index c9cea4109dc4..0892933566de 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null, snapscanFirmware ? null }: let firmware = gt68xxFirmware { inherit fetchurl; }; in @@ -29,6 +29,11 @@ stdenv.mkDerivation { if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name + else if snapscanFirmware != null then + "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware + + " \${out}/share/sane/snapscan/your-firmwarefile.bin ;" + + "mkdir -p \${out}/etc/sane.d ; " + + "echo epson2 > \${out}/etc/sane.d/dll.conf" else ""; meta = { diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index a53466ae8188..acb4ab12d4dd 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }: +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null , snapscanFirmware ? null }: assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name + else if snapscanFirmware != null then + "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware + + " \${out}/share/sane/snapscan/your-firmwarefile.bin" else ""; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674dd7dd9980..2dbc9c2e1bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10067,12 +10067,14 @@ let saneBackends = callPackage ../applications/graphics/sane/backends.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; libusb = libusb1; }; saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; }; From b5bac4c7a4de0209cd4f704ddf23d88adf0b599a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 9 Nov 2013 14:35:35 +0100 Subject: [PATCH 129/760] sane: tidy-up, wrap expression arguments --- pkgs/applications/graphics/sane/backends-git.nix | 4 +++- pkgs/applications/graphics/sane/backends.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 0892933566de..7ba6e1756ba0 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null, snapscanFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null +, gt68xxFirmware ? null, snapscanFirmware ? null +}: let firmware = gt68xxFirmware { inherit fetchurl; }; in diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index acb4ab12d4dd..eaf1c3b725f0 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null , snapscanFirmware ? null }: +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null +, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null +}: assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); From 1ff90228b290b1449b2dc82b2647a21eead14a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 9 Nov 2013 12:32:30 +0100 Subject: [PATCH 130/760] xsane: add optional gimp plugin support --- pkgs/applications/graphics/sane/xsane.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index de8d4c336521..32b39c0160d3 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }: +{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng +, libusb ? null +, gimpSupport ? false, gimp_2_8 ? null +}: + +assert gimpSupport -> gimp_2_8 != null; stdenv.mkDerivation rec { name = "xsane-0.998"; @@ -12,8 +17,9 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c ''; - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++ - (if libusb != null then [libusb] else []); + buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] + ++ (if libusb != null then [libusb] else []) + ++ stdenv.lib.optional gimpSupport gimp_2_8; meta = { homepage = http://www.sane-project.org/; From 2a9bdac39aa17516495a82441f018712d0ad4eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Oct 2013 20:41:40 +0200 Subject: [PATCH 131/760] gtk2: minor update .20 -> .22 --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 92463d80c2bd..fdc2c675847f 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.20"; + name = "gtk+-2.24.22"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "18qdvb7nxi25hfnpmcy01p3majw9jnx83ikm263dk9rrjazvqrnc"; + sha256 = "0zxf810znlk80j230rbr0xscx3gm71jmf2bdiamg76rqzglvc55i"; }; enableParallelBuilding = true; From 61528849e3020e9bfdd152b569a0e8302748bbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Oct 2013 15:19:39 +0200 Subject: [PATCH 132/760] mesa: bugfix update 9.1.6 -> .7 Thist is just for master before the official release, x-updates has 9.2.* already. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4fa5ee9e74ae..6a0ae2cf61e7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else */ let - version = "9.1.6"; + version = "9.1.7"; # this is the default search path for DRI drivers (note: X server introduces an overriding env var) driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "0gay00fy84hrnp25hpacz5cbvxrpvgg1d390vichmbdgmkqdycp6"; + sha256 = "1824p185ys7z9bah46xasp7khv44n9wv2c4p38i1dispniwbirih"; }; prePatch = "patchShebangs ."; From 0c555809d15342f31e8e67217c0d15d016835473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 9 Nov 2013 16:27:11 +0100 Subject: [PATCH 133/760] gimp: upgrade to 2.8.8 This also fixes color management support (lcms2) --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4e12e2320815..d6b005e8e3d5 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.6"; + name = "gimp-2.8.8"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "12b3fdf33d1f07ae79b412a9e38b9693"; + md5 = "ef2547c3514a1096931637bd6250635a"; }; buildInputs = From 8d14c7baa6b293b3b48741b203400116ed9882ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 9 Nov 2013 16:29:18 +0100 Subject: [PATCH 134/760] polkit: major update 0.105 -> 0.112 - It now uses JavaScript for configuration (only), so I had to "convert" config for NetworkManager. - I tested suspend/restart/(un)mount on KDE/Xfce, Phreedom tested NetworkManager config conversion. --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/security/polkit.nix | 77 ++++++++----------- .../services/networking/networkmanager.nix | 15 +++- .../interpreters/spidermonkey/185-1.0.0.nix | 6 +- pkgs/development/libraries/polkit/default.nix | 54 +++++++------ pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 81 insertions(+), 77 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3edc9dda6b6..29a29834e973 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -140,7 +140,7 @@ tape = 25; video = 26; dialout = 27; - polkituser = 28; + #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; davfs2 = 31; privoxy = 32; diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index cafa9f82d5e4..940e87e0b024 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -18,35 +18,17 @@ in description = "Whether to enable PolKit."; }; - security.polkit.permissions = mkOption { + security.polkit.extraConfig = mkOption { type = types.lines; default = ""; example = '' - [Disallow Users To Suspend] - Identity=unix-group:users - Action=org.freedesktop.upower.* - ResultAny=no - ResultInactive=no - ResultActive=no - - [Allow Anybody To Eject Disks] - Identity=unix-user:* - Action=org.freedesktop.udisks.drive-eject - ResultAny=yes - ResultInactive=yes - ResultActive=yes - - [Allow Alice To Mount Filesystems After Admin Authentication] - Identity=unix-user:alice - Action=org.freedesktop.udisks.filesystem-mount - ResultAny=auth_admin - ResultInactive=auth_admin - ResultActive=auth_admin + TODO ''; description = '' - Allows the default permissions of privileged actions to be overridden. + Any polkit rules to be added to config (in JavaScript ;-). See: + http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules ''; }; @@ -71,29 +53,23 @@ in environment.systemPackages = [ pkgs.polkit ]; - # The polkit daemon reads action files - environment.pathsToLink = [ "/share/polkit-1/actions" ]; + systemd.packages = [ pkgs.polkit ]; - environment.etc = - [ # No idea what the "null backend" is, but it seems to need this. - { source = "${pkgs.polkit}/etc/polkit-1/nullbackend.conf.d"; - target = "polkit-1/nullbackend.conf.d"; - } + # The polkit daemon reads action/rule files + environment.pathsToLink = [ "/share/polkit-1" ]; - # This file determines what users are considered - # "administrators". - { source = pkgs.writeText "10-nixos.conf" - '' - [Configuration] - AdminIdentities=${cfg.adminIdentities} - ''; - target = "polkit-1/localauthority.conf.d/10-nixos.conf"; - } + # PolKit rules for NixOS + environment.etc = [ { + source = pkgs.writeText "10-nixos.conf" + '' + polkit.addAdminRule(function(action, subject) { + return ["${cfg.adminIdentities}"]; + }); - { source = pkgs.writeText "org.nixos.pkla" cfg.permissions; - target = "polkit-1/localauthority/10-vendor.d/org.nixos.pkla"; - } - ]; + ${cfg.extraConfig} + ''; #TODO: validation on compilation (at least against typos) + target = "polkit-1/rules.d/10-nixos.conf"; + } ]; services.dbus.packages = [ pkgs.polkit ]; @@ -101,24 +77,31 @@ in security.setuidPrograms = [ "pkexec" ]; - security.setuidOwners = singleton + security.setuidOwners = [ { program = "polkit-agent-helper-1"; owner = "root"; group = "root"; setuid = true; - source = "${pkgs.polkit}/libexec/polkit-1/polkit-agent-helper-1"; - }; + source = "${pkgs.polkit}/lib/polkit-1/polkit-agent-helper-1"; + } + ]; system.activationScripts.polkit = '' - mkdir -p /var/lib/polkit-1/localauthority - chmod 700 /var/lib/polkit-1{/localauthority,} + # Probably no more needed, clean up + rm -rf /var/lib/{polkit-1,PolicyKit} # Force polkitd to be restarted so that it reloads its # configuration. ${pkgs.procps}/bin/pkill -INT -u root -x polkitd ''; + users.extraUsers.polkituser = { + description = "PolKit daemon"; + uid = config.ids.uids.polkituser; + }; + }; } + diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ad6f9858aaf6..2e8d17d872d2 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -21,7 +21,7 @@ let level=WARN ''; - polkitConf = '' + /* [network-manager] Identity=unix-group:networkmanager Action=org.freedesktop.NetworkManager.* @@ -35,6 +35,17 @@ let ResultAny=yes ResultInactive=no ResultActive=yes + */ + polkitConf = '' + polkit.addRule(function(action, subject) { + if ( + subject.isInGroup("networkmanager") + && subject.active + && (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 + || action.id.indexOf("org.freedesktop.ModemManager.") == 0 + )) + { return polkit.Result.YES; } + }); ''; ipUpScript = writeScript "01nixos-ip-up" '' @@ -179,7 +190,7 @@ in { systemctl restart NetworkManager ''; - security.polkit.permissions = polkitConf; + security.polkit.extraConfig = polkitConf; # openvpn plugin has only dbus interface services.dbus.packages = cfg.packages ++ [ diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 55e0dada71e0..1c0d77345b73 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }: +{ stdenv, fetchurl, pkgconfig, autoconf213, nspr, perl, python, readline, zip }: stdenv.mkDerivation rec { version = "185-1.0.0"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; }; - buildInputs = [ autoconf213 nspr perl python readline zip ]; + propagatedBuildInputs = [ nspr ]; + + buildInputs = [ pkgconfig autoconf213 perl python readline zip ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 9d1f0d18c1ad..821e66ea0b30 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,48 +1,59 @@ -{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext -, gobjectIntrospection +{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey +, gobjectIntrospection, libxslt, docbook_xsl , useSystemd ? stdenv.isLinux, systemd }: let system = "/var/run/current-system/sw"; + setuid = "/var/setuid-wrappers"; #TODO: from config.security.wrapperDir; foolVars = { - LOCALSTATE = "/var"; SYSCONF = "/etc"; - LIB = "${system}/lib"; - DATA = "${system}/share"; + DATA = "${system}/share"; # to find share/polkit-1/actions of other apps at runtime }; in stdenv.mkDerivation rec { - name = "polkit-0.105"; + name = "polkit-0.112"; src = fetchurl { url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; - sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g"; + sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn"; }; buildInputs = - [ pkgconfig glib expat pam intltool gobjectIntrospection ] + [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] + ++ [ libxslt docbook_xsl ] # man pages ++ stdenv.lib.optional useSystemd systemd; - configureFlags = "--libexecdir=$(out)/libexec/polkit-1"; - # Ugly hack to overwrite hardcoded directories # TODO: investigate a proper patch which will be accepted upstream + # After update it's good to check the sources via: + # grep '\ config.ids.uids.polkituser + "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS + ]; makeFlags = '' @@ -50,12 +61,7 @@ stdenv.mkDerivation rec { INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0 ''; - postInstall = - '' - # Allow some files with paranoid permissions to be stripped in - # the fixup phase. - chmod a+rX -R $out - ''; + #doCheck = true; # some /bin/bash problem that isn't auto-solved by patchShebangs meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/polkit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5737918cff8..9a4118098a5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5400,7 +5400,9 @@ let podofo = callPackage ../development/libraries/podofo { }; - polkit = callPackage ../development/libraries/polkit { }; + polkit = callPackage ../development/libraries/polkit { + spidermonkey = spidermonkey_185; + }; polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { }; From 673fc81337a6bb370a7ec1084cb954e715515e4a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 7 Nov 2013 11:29:18 +0100 Subject: [PATCH 135/760] nixos/graphite: fix storage dir for carbon --- nixos/modules/services/monitoring/graphite.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 08e6ef662cc3..61aa30e57e13 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -15,6 +15,7 @@ let PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages"; GRAPHITE_ROOT = dataDir; GRAPHITE_CONF_DIR = "/etc/graphite/"; + GRAPHITE_STORAGE_DIR = dataDir; }; in { From 62ebdd7a6adbc40c0ab92c9126ac0ed77045f0df Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 28 Oct 2013 00:13:23 +0000 Subject: [PATCH 136/760] rubyLibs.resque_web: add expression --- .../interpreters/ruby/generated.nix | 290 +++++++++++++++++- 1 file changed, 281 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index f0cfa7b01527..761aeb921cc3 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -12,7 +12,7 @@ g: # Get dependencies from patched gems activesupport = g.activesupport_4_0_0; addressable = g.addressable_2_3_5; arel = g.arel_4_0_0; - atomic = g.atomic_1_1_13; + atomic = g.atomic_1_1_14; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; aws_sdk = g.aws_sdk_1_16_1; @@ -24,6 +24,9 @@ g: # Get dependencies from patched gems childprocess = g.childprocess_0_3_9; chronic = g.chronic_0_10_1; coderay = g.coderay_1_0_9; + coffee_rails = g.coffee_rails_4_0_1; + coffee_script = g.coffee_script_2_2_0; + coffee_script_source = g.coffee_script_source_1_6_3; cucumber = g.cucumber_1_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; @@ -35,6 +38,7 @@ g: # Get dependencies from patched gems ethon = g.ethon_0_6_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; + execjs = g.execjs_2_0_2; fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_8; faraday_middleware = g.faraday_middleware_0_9_0; @@ -50,6 +54,7 @@ g: # Get dependencies from patched gems http_cookie = g.http_cookie_1_0_1; i18n = g.i18n_0_6_5; iconv = g.iconv_1_0_3; + jquery_rails = g.jquery_rails_3_0_4; jruby_pageant = g.jruby_pageant_1_1_1; jsduck = g.jsduck_5_1_0; json = g.json_1_8_0; @@ -65,7 +70,8 @@ g: # Get dependencies from patched gems mini_portile = g.mini_portile_0_5_1; minitar = g.minitar_0_5_3; minitest = g.minitest_4_7_5; - multi_json = g.multi_json_1_7_9; + mono_logger = g.mono_logger_1_1_0; + multi_json = g.multi_json_1_8_2; multi_test = g.multi_test_0_0_2; multipart_post = g.multipart_post_1_2_0; net_http_digest_auth = g.net_http_digest_auth_1_4; @@ -84,14 +90,17 @@ g: # Get dependencies from patched gems pry = g.pry_0_9_12_2; pusher_client = g.pusher_client_0_3_1; rack = g.rack_1_5_2; - rack_protection = g.rack_protection_1_5_0; - rack_test = g.rack_test_0_6_2; + rack_protection = g.rack_protection_1_5_1; rails = g.rails_4_0_0; railties = g.railties_4_0_0; rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_1_6; + redis = g.redis_3_0_5; + redis_namespace = g.redis_namespace_1_3_1; remote_syslog = g.remote_syslog_1_6_14; + resque = g.resque_1_25_1; + resque_web = g.resque_web_0_0_3; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; @@ -105,13 +114,14 @@ g: # Get dependencies from patched gems ruby_hmac = g.ruby_hmac_0_4_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_10; + sass = g.sass_3_2_12; + sass_rails = g.sass_rails_4_0_1; selenium_webdriver = g.selenium_webdriver_2_35_1; servolux = g.servolux_0_10_0; - sinatra = g.sinatra_1_3_2; + sinatra = g.sinatra_1_4_4; slop = g.slop_3_4_6; sprockets = g.sprockets_2_10_0; - sprockets_rails = g.sprockets_rails_2_0_0; + sprockets_rails = g.sprockets_rails_2_0_1; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; taskjuggler = g.taskjuggler_3_5_0; @@ -120,19 +130,21 @@ g: # Get dependencies from patched gems text = g.text_1_2_3; thin = g.thin_1_5_1; thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_2; + thread_safe = g.thread_safe_0_1_3; tilt = g.tilt_1_4_1; tins = g.tins_0_9_0; travis = g.travis_1_5_3; treetop = g.treetop_1_4_15; trollop = g.trollop_2_0; + twitter_bootstrap_rails = g.twitter_bootstrap_rails_2_2_8; typhoeus = g.typhoeus_0_6_5; - tzinfo = g.tzinfo_0_3_37; + tzinfo = g.tzinfo_0_3_38; unf = g.unf_0_1_2; unf_ext = g.unf_ext_0_0_6; unicode = g.unicode_0_4_4; uuid = g.uuid_2_3_7; uuidtools = g.uuidtools_2_1_4; + vegas = g.vegas_0_1_11; webrobots = g.webrobots_0_1_1; websocket = g.websocket_1_0_7; xapian_full = g.xapian_full_1_2_3; @@ -282,6 +294,17 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s''; }; + atomic_1_1_14 = { + basename = ''atomic''; + meta = { + description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + homepage = ''http://github.com/headius/ruby-atomic''; + longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + }; + name = ''atomic-1.1.14''; + requiredGems = [ ]; + sha256 = ''09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4''; + }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; meta = { @@ -468,6 +491,45 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8''; }; + coffee_rails_4_0_1 = { + basename = ''coffee_rails''; + meta = { + description = ''CoffeeScript adapter for the Rails asset pipeline.''; + homepage = ''https://github.com/rails/coffee-rails''; + longDescription = ''CoffeeScript adapter for the Rails asset pipeline.''; + }; + name = ''coffee-rails-4.0.1''; + requiredGems = [ g.coffee_script_2_2_0 g.railties_4_0_0 ]; + sha256 = ''12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig''; + }; + coffee_script_2_2_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.2.0''; + requiredGems = [ g.coffee_script_source_1_6_3 g.execjs_2_0_2 ]; + sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; + }; + coffee_script_source_1_6_3 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.6.3''; + requiredGems = [ ]; + sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4''; + }; cucumber_1_3_8 = { basename = ''cucumber''; meta = { @@ -649,6 +711,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; + execjs_2_0_2 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; + }; + name = ''execjs-2.0.2''; + requiredGems = [ ]; + sha256 = ''167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs''; + }; fakes3_0_1_5 = { basename = ''fakes3''; meta = { @@ -854,6 +927,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; }; + jquery_rails_3_0_4 = { + basename = ''jquery_rails''; + meta = { + description = ''Use jQuery with Rails 3''; + homepage = ''http://rubygems.org/gems/jquery-rails''; + longDescription = ''This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.''; + }; + name = ''jquery-rails-3.0.4''; + requiredGems = [ g.railties_4_0_0 g.thor_0_18_1 ]; + sha256 = ''0k13mcl9d0zxa2azml0d06y14ggk5yl2xvzsc9l2qv2cwc9xxajm''; + }; jruby_pageant_1_1_1 = { basename = ''jruby_pageant''; meta = { @@ -1133,6 +1217,17 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; }; + mono_logger_1_1_0 = { + basename = ''mono_logger''; + meta = { + description = ''A lock-free logger compatible with Ruby 2.0.''; + homepage = ''http://github.com/steveklabnik/mono_logger''; + longDescription = ''A lock-free logger compatible with Ruby 2.0. Ruby does not allow you to request a lock in a trap handler because that could deadlock, so Logger is not sufficient.''; + }; + name = ''mono_logger-1.1.0''; + requiredGems = [ ]; + sha256 = ''18yplq3xxv5crwpfwbw2sb6brqd3g51si7x9fbh9bcimg4ipzayp''; + }; multi_json_1_7_9 = { basename = ''multi_json''; meta = { @@ -1144,6 +1239,17 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx''; }; + multi_json_1_8_2 = { + basename = ''multi_json''; + meta = { + description = ''A common interface to multiple JSON libraries.''; + homepage = ''http://github.com/intridea/multi_json''; + longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; + }; + name = ''multi_json-1.8.2''; + requiredGems = [ ]; + sha256 = ''1ffmnwsfwdgspk86x1g98cq2ivqlgqpqngyrvs07zsnvgdimahdb''; + }; multi_test_0_0_2 = { basename = ''multi_test''; meta = { @@ -1409,6 +1515,17 @@ Also see http://rack.github.com/. requiredGems = [ g.rack_1_5_2 ]; sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; }; + rack_protection_1_5_1 = { + basename = ''rack_protection''; + meta = { + description = ''You should use protection!''; + homepage = ''http://github.com/rkh/rack-protection''; + longDescription = ''You should use protection!''; + }; + name = ''rack-protection-1.5.1''; + requiredGems = [ g.rack_1_5_2 ]; + sha256 = ''0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd''; + }; rack_test_0_6_2 = { basename = ''rack_test''; meta = { @@ -1499,6 +1616,34 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; + redis_3_0_5 = { + basename = ''redis''; + meta = { + description = ''A Ruby client library for Redis''; + homepage = ''https://github.com/redis/redis-rb''; + longDescription = '' A Ruby client that tries to match Redis' API one-to-one, while still + providing an idiomatic interface. It features thread-safety, + client-side sharding, pipelining, and an obsession for performance. +''; + }; + name = ''redis-3.0.5''; + requiredGems = [ ]; + sha256 = ''01gg3mgh3yznfhxschcka593a3ivsyw5g5vr0g5apiz4lfh6dlkn''; + }; + redis_namespace_1_3_1 = { + basename = ''redis_namespace''; + meta = { + description = ''Namespaces Redis commands.''; + homepage = ''http://github.com/resque/redis-namespace''; + longDescription = ''Adds a Redis::Namespace class which can be used to namespace calls +to Redis. This is useful when using a single instance of Redis with +multiple, different applications. +''; + }; + name = ''redis-namespace-1.3.1''; + requiredGems = [ g.redis_3_0_5 ]; + sha256 = ''1l6a64z09ni5pi6mbgvsph0lp14cnp180aj7mxnq2nb38sig4iw5''; + }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { @@ -1510,6 +1655,42 @@ request helpers feature.''; requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; + resque_1_25_1 = { + basename = ''resque''; + meta = { + description = ''Resque is a Redis-backed queueing system.''; + homepage = ''http://github.com/defunkt/resque''; + longDescription = '' Resque is a Redis-backed Ruby library for creating background jobs, + placing those jobs on multiple queues, and processing them later. + + Background jobs can be any Ruby class or module that responds to + perform. Your existing classes can easily be converted to background + jobs or you can create new classes specifically to do work. Or, you + can do both. + + Resque is heavily inspired by DelayedJob (which rocks) and is + comprised of three parts: + + * A Ruby library for creating, querying, and processing jobs + * A Rake task for starting a worker which processes jobs + * A Sinatra app for monitoring queues, jobs, and workers. +''; + }; + name = ''resque-1.25.1''; + requiredGems = [ g.redis_namespace_1_3_1 g.vegas_0_1_11 g.sinatra_1_4_4 g.multi_json_1_8_2 g.mono_logger_1_1_0 ]; + sha256 = ''0p9kpj900cyb888wmpqx6ms9b0hza09glr4cvrwqwp1vqya25lpy''; + }; + resque_web_0_0_3 = { + basename = ''resque_web''; + meta = { + description = ''Rails-based Resque web interface''; + homepage = ''https://github.com/resque/resque-web''; + longDescription = ''A Rails-based frontend to the Resque job queue system.''; + }; + name = ''resque-web-0.0.3''; + requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ]; + sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2''; + }; right_aws_3_1_0 = { basename = ''right_aws''; meta = { @@ -1739,6 +1920,32 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; }; + sass_3_2_12 = { + basename = ''sass''; + meta = { + description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; + homepage = ''http://sass-lang.com/''; + longDescription = '' Sass makes CSS fun again. Sass is an extension of CSS3, adding + nested rules, variables, mixins, selector inheritance, and more. + It's translated to well-formatted, standard CSS using the + command line tool or a web-framework plugin. +''; + }; + name = ''sass-3.2.12''; + requiredGems = [ ]; + sha256 = ''074118ia17nx68i97mbkly2f08y57j52b2yfhdc3s02s4s5593f8''; + }; + sass_rails_4_0_1 = { + basename = ''sass_rails''; + meta = { + description = ''Sass adapter for the Rails asset pipeline.''; + homepage = ''https://github.com/rails/sass-rails''; + longDescription = ''Sass adapter for the Rails asset pipeline.''; + }; + name = ''sass-rails-4.0.1''; + requiredGems = [ g.sass_3_2_12 g.railties_4_0_0 g.sprockets_rails_2_0_1 ]; + sha256 = ''01sacnipgvl7ad39zzbr6iip6jja7blxfbpjg2dnm6w8gi6smxh1''; + }; selenium_webdriver_2_35_1 = { basename = ''selenium_webdriver''; meta = { @@ -1775,6 +1982,17 @@ interpreters.''; requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; + sinatra_1_4_4 = { + basename = ''sinatra''; + meta = { + description = ''Classy web-development dressed in a DSL''; + homepage = ''http://www.sinatrarb.com/''; + longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; + }; + name = ''sinatra-1.4.4''; + requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_1 ]; + sha256 = ''12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs''; + }; slop_3_4_6 = { basename = ''slop''; meta = { @@ -1807,6 +2025,16 @@ interpreters.''; requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x''; }; + sprockets_rails_2_0_1 = { + basename = ''sprockets_rails''; + meta = { + description = ''Sprockets Rails integration''; + homepage = ''https://github.com/rails/sprockets-rails''; + }; + name = ''sprockets-rails-2.0.1''; + requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; + sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy''; + }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; meta = { @@ -1914,6 +2142,17 @@ management. requiredGems = [ g.atomic_1_1_13 ]; sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; }; + thread_safe_0_1_3 = { + basename = ''thread_safe''; + meta = { + description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; + homepage = ''https://github.com/headius/thread_safe''; + longDescription = ''Thread-safe collections and utilities for Ruby''; + }; + name = ''thread_safe-0.1.3''; + requiredGems = [ g.atomic_1_1_14 ]; + sha256 = ''0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq''; + }; tilt_1_4_1 = { basename = ''tilt''; meta = { @@ -1972,6 +2211,17 @@ specify.''; requiredGems = [ ]; sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; }; + twitter_bootstrap_rails_2_2_8 = { + basename = ''twitter_bootstrap_rails''; + meta = { + description = ''Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; + homepage = ''https://github.com/seyhunak/twitter-bootstrap-rails''; + longDescription = ''twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; + }; + name = ''twitter-bootstrap-rails-2.2.8''; + requiredGems = [ g.railties_4_0_0 g.actionpack_4_0_0 g.execjs_2_0_2 g.rails_4_0_0 ]; + sha256 = ''06n836l2kj5ld7w6b1pb5q423mhqnahf4phk5ai5vl927p4g3bgy''; + }; typhoeus_0_6_5 = { basename = ''typhoeus''; meta = { @@ -1994,6 +2244,17 @@ specify.''; requiredGems = [ ]; sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; }; + tzinfo_0_3_38 = { + basename = ''tzinfo''; + meta = { + description = ''Daylight-savings aware timezone library''; + homepage = ''http://tzinfo.github.io''; + longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; + }; + name = ''tzinfo-0.3.38''; + requiredGems = [ ]; + sha256 = ''1s339ravgk0rqm5dhv1l0yi81sczjvdiryn8ihi2czkb0md55j68''; + }; unf_0_1_2 = { basename = ''unf''; meta = { @@ -2054,6 +2315,17 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3''; }; + vegas_0_1_11 = { + basename = ''vegas''; + meta = { + description = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.''; + homepage = ''http://code.quirkey.com/vegas''; + longDescription = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.''; + }; + name = ''vegas-0.1.11''; + requiredGems = [ g.rack_1_5_2 ]; + sha256 = ''0kzv0v1zb8vvm188q4pqwahb6468bmiamn6wpsbiq6r5i69s1bs5''; + }; webrobots_0_1_1 = { basename = ''webrobots''; meta = { From f1a537bee6f866d2713b9c9bf96eae5db173e3b1 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 28 Oct 2013 23:05:17 +0000 Subject: [PATCH 137/760] pythonPackages.mpmath: add expression --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0854b6dcd32..e6a6e1e60768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3469,6 +3469,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + mpmath = buildPythonPackage rec { + name = "mpmath-0.17"; + + src = fetchurl { + url = "https://mpmath.googlecode.com/files/${name}.tar.gz"; + sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh"; + }; + + meta = with stdenv.lib; { + homepage = http://mpmath.googlecode.com; + description = "A pure-Python library for multiprecision floating arithmetic"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + # error: invalid command 'test' + doCheck = false; + }; + + mrbob = buildPythonPackage rec { name = "mrbob-${version}"; version = "0.1a9"; From 2923631287ece1ff215f3058cd823512b1aca098 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 9 Nov 2013 17:46:54 +0100 Subject: [PATCH 138/760] libunibreak: meta.platforms attribute --- pkgs/development/libraries/libunibreak/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index e5e7f5ff0ae8..5fb8622d1e0f 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25"; }; - meta = { + meta = with stdenv.lib; { homepage = http://vimgadgets.sourceforge.net/libunibreak/; description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; - license = "ZLIB"; - maintainer = [ stdenv.lib.maintainers.coroa ]; + license = licenses.zlib; + platforms = platforms.unix; + maintainer = [ maintainers.coroa ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dbc9c2e1bb2..687a5fb62eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5027,7 +5027,7 @@ let libungif = callPackage ../development/libraries/giflib/libungif.nix { }; - libunibreak = callPackage ../development/libraries/libunibreak/default.nix { }; + libunibreak = callPackage ../development/libraries/libunibreak { }; libunique = callPackage ../development/libraries/libunique/default.nix { }; From a131ce533d98eb587d76dd8e2afc6e19568cd7e1 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 9 Nov 2013 17:47:43 +0100 Subject: [PATCH 139/760] fbreader: add meta.platforms attribute --- pkgs/applications/misc/fbreader/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index fa361308ff1a..612285c697c6 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation { --replace "/usr/share" "$out/share" ''; - meta = { + meta = with stdenv.lib; { description = "An e-book reader for Linux"; homepage = http://www.fbreader.org/; - license = "GPL"; - maintainer = [ stdenv.lib.maintainers.coroa ]; + license = licenses.gpl3; + platforms = platforms.linux; # possibly also on unix general + maintainer = [ maintainers.coroa ]; }; } From e8361c3523de3de7031c87ca05a7dac17ed17ed2 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 8 Nov 2013 17:30:00 +0100 Subject: [PATCH 140/760] linux: Update to 3.11.7 --- pkgs/os-specific/linux/kernel/linux-3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 6531895d8a7b..52e2032daabd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11.6"; + version = "3.11.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0klbyx6qy3ifwrwh5w7yzk6m6jd32flkk73z95bih3ihmbnbzlvs"; + sha256 = "1nb93pchv72c7jibv1kvkmgkg2556gb9a0xx21nf9mclf46a9dx9"; }; features.iwlwifi = true; From 9b6fb1ebd50422281d92b7ad538e66ebd5542ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 19:03:16 +0100 Subject: [PATCH 141/760] tig: bump 1.1 -> 1.2.1 XML_CATALOG_FILES is needed to be able to build the asciidoc documentation/manpages in this new version. --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/tig/default.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index af1ab52c04d7..9f7f26041ca6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -66,7 +66,7 @@ rec { }; tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl; + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45; }; hub = import ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index bdd6e806fe3b..335c533fe448 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }: +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tig-1.1"; + name = "tig-1.2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - md5 = "adeb797a8320962eeb345a615257cbac"; + sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + preConfigure = '' + export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + ''; installPhase = '' make install make install-doc From b8e890539e236a5a6c59a08e094aac65b741f3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 19:06:55 +0100 Subject: [PATCH 142/760] tig: small expression cleanup * Add a bit of whitespace to make it easier on the eyes * Shorten the description (and remove package name) --- .../version-management/git-and-tools/tig/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 335c533fe448..23009efdbd54 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -2,24 +2,29 @@ stdenv.mkDerivation rec { name = "tig-1.2.1"; + src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; - buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + + buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; + preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' ''; + installPhase = '' make install make install-doc mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ ''; + meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; - description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ maintainers.garbas maintainers.bjornfor maintainers.iElectric ]; + description = "Text-mode interface for git"; + maintainers = with maintainers; [ garbas bjornfor iElectric ]; license = licenses.gpl2; platforms = platforms.linux; }; From 46581c6918b06fa502a587a509229e5eccc07d5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:19:13 +0100 Subject: [PATCH 143/760] subversion: install bash completion --- pkgs/applications/version-management/subversion/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8169011c325d..bdf34cdba9a4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation rec { make install cd - fi + + mkdir -p $out/share/bash-completion/completions + cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion ''; inherit perlBindings pythonBindings; From 981c28735583f983ae25050fd1fc9533ae501aa0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 20:36:25 +0100 Subject: [PATCH 144/760] ghc: several enhancements to the new "with-packages" wrapper 1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of "--global-package-db". The result was that packages installed locally in ~/.ghc and ~/.cabal were invisible to GHC. This has been fixed. 2) The wrapper now deals gracefully with an empty package set: if no package is requested to be included in the wrapped environment, the wrapper just installs a pristine GHC. 3) Correctly configure the "docdir" path returned by ghc-paths. 4) Added some comments that describe the idea behind our ghc-paths patches and gives users same sample shell code that can be used to import our special environment variables into the currently running shell, so that programs outside of the wrapped environment can use them, too. --- .../compilers/ghc/with-packages.nix | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 4508f0f529b5..9909c49e1435 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -1,14 +1,38 @@ { stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: -assert packages != []; +# This wrapper works only with GHC 6.12 or later. +assert stdenv.lib.versionOlder "6.12" ghc.version; + +# It's probably a good idea to include the library "ghc-paths" in the +# compiler environment, because we have a specially patched version of +# that package in Nix that honors these environment variables +# +# NIX_GHC +# NIX_GHCPKG +# NIX_GHC_DOCDIR +# NIX_GHC_LIBDIR +# +# instead of hard-coding the paths. The wrapper sets these variables +# appropriately to configure ghc-paths to point back to the wrapper +# instead of to the pristine GHC package, which doesn't know any of the +# additional libraries. +# +# A good way to import the environment set by the wrapper below into +# your shell is to add the following snippet to your ~/.bashrc: +# +# if [ -e ~/.nix-profile/bin/ghc ]; then +# eval $(grep export ~/.nix-profile/bin/ghc) +# fi let ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; - packageDBFlag = if ghc761OrLater then "--package-db" else "--package-conf"; + packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; libDir = "$out/lib/ghc-${ghc.version}"; + docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; isHaskellPkg = x: (x ? pname) && (x ? version); in +if packages == [] then ghc else buildEnv { name = "haskell-env-${ghc.name}"; paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; @@ -22,6 +46,7 @@ buildEnv { --add-flags '"-B$NIX_GHC_LIBDIR"' \ --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done @@ -31,12 +56,13 @@ buildEnv { --add-flags "-f $out/bin/ghc" \ --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done for prg in ghc-pkg ghc-pkg-${ghc.version}; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag} ${packageCfgDir}" + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done $out/bin/ghc-pkg recache From e4d841eef4ca99976c4556ba2eb938a44a4cdca6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 12:16:05 +0100 Subject: [PATCH 145/760] Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions. This change is intended to fix and to address some of the concerns that come up during the discussion of . --- .../compilers/ghc/with-packages-old.nix | 127 ------------------ pkgs/top-level/haskell-packages.nix | 5 +- 2 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/with-packages-old.nix diff --git a/pkgs/development/compilers/ghc/with-packages-old.nix b/pkgs/development/compilers/ghc/with-packages-old.nix deleted file mode 100644 index 8acb2511e81d..000000000000 --- a/pkgs/development/compilers/ghc/with-packages-old.nix +++ /dev/null @@ -1,127 +0,0 @@ -{stdenv, ghc, packages ? [], makeWrapper}: - -stdenv.mkDerivation rec { - name = "haskell-env-${ghc.name}"; - - allPackages = stdenv.lib.filter (x: x ? pname) (stdenv.lib.closePropagation packages); - buildInputs = allPackages ++ [makeWrapper]; - propagatedBuildInputs = packages; - - unpackPhase = "true"; - - installPhase = '' - numversion=$(${ghc}/bin/ghc --numeric-version) - majorversion=''${numversion%%.*} - minorversion=''${numversion#*.} - minorversion=''${minorversion%%.*} - - if [[ $majorversion -gt 6 ]] && [[ $minorversion -gt 4 ]]; then - globalConf="--global-package-db" - else - globalConf="--global-conf" - fi - - originalTopDir="${ghc}/lib/ghc-${ghc.version}" - originalPkgDir="$originalTopDir/package.conf.d" - linkedTopDir="$out/lib/ghc-${ghc.version}" - linkedPkgDir="$linkedTopDir/package.conf.d" - - mkdir -p $out/bin - mkdir -p $linkedTopDir - mkdir -p $linkedPkgDir - - echo "Linking GHC core libraries:" - - echo -n "Linking $originalTopDir " - for f in "$originalTopDir/"*; do - if test -f $f; then - ln -s $f $linkedTopDir - echo -n . - fi - done - echo - - echo -n "Linking $originalPkgDir " - for f in "$originalPkgDir/"*.conf; do - ln -s $f $linkedPkgDir - echo -n . - done - echo - - echo "Linking selected packages and dependencies:" - - for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do - currentPkgDir="$currentPath/lib/ghc-${ghc.version}" - # Check if current path is a Cabal package for the current GHC - if test -d $currentPkgDir; then - echo -n "Linking $currentPath " - for f in "$currentPath/bin/"*; do - ln -s $f $out/bin - echo -n . - done - for f in "$currentPath/etc/bash_completion.d/"*; do - mkdir -p $out/etc/bash_completion.d - ln -s $f $out/etc/bash_completion.d/ - echo -n . - done - for s in 1 2 3 4 5 6 7 8 9; do - for f in "$currentPath/share/man/man$s/"*; do - mkdir -p $out/share/man/man$s - ln -sv $f $out/share/man/man$s/ - echo -n . - done - done - for f in "$currentPath/share/emacs/site-lisp/"*; do - mkdir -p $out/share/emacs/site-lisp - ln -s $f $out/share/emacs/site-lisp/ - echo -n . - done - for f in "$currentPath/share/ghci/"*; do - mkdir -p $out/share/ghci - ln -s $f $out/share/ghci/ - echo -n . - done - for f in "$currentPkgDir/package.conf.d/"*.conf; do - ln -s $f $linkedPkgDir - echo -n . - done - echo - fi - done - - echo -n "Generating package cache " - ${ghc}/bin/ghc-pkg $globalConf $linkedPkgDir recache - echo . - - echo -n "Generating wrappers " - - for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do - # The NIX env-vars are picked up by our patched version of ghc-paths. - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-B$linkedTopDir" \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_LIBDIR" "$linkedTopDir" - echo -n . - done - - for prg in runghc runhaskell; do - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" - echo -n . - done - - for prg in ghc-pkg ghc-pkg-${ghc.version}; do - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "$globalConf $linkedPkgDir" - echo -n . - done - - for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do - if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then - ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . - fi - done - echo - ''; - - meta = ghc.meta; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 24bc93df8655..50ee769e7d4a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -107,10 +107,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ignoreCollisions = false; }; - ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix { - ghc = ghc; # refers to ghcPlain - packages = pkgs self; - }; + ghcWithPackagesOld = pkgs : (self.ghcWithPackages pkgs).override { ignoreCollisions = true; }; # This is the Cabal builder, the function we use to build most Haskell # packages. It isn't the Cabal library, which is spelled "Cabal". From dc352536a8be332aa520d732c656189478ecb104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 20:06:01 +0100 Subject: [PATCH 146/760] nixos: capitalize a bunch of service descriptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (systemd service descriptions that is, not service descriptions in "man configuration.nix".) Capitalizing each word in the description seems to be the accepted standard. Also shorten these descriptions: * "Munin node, the agent process" => "Munin Node" * "Planet Venus, an awesome ‘river of news’ feed reader" => "Planet Venus Feed Reader" --- nixos/modules/config/pulseaudio.nix | 2 +- nixos/modules/programs/venus.nix | 2 +- nixos/modules/services/hardware/bluetooth.nix | 2 +- nixos/modules/services/monitoring/apcupsd.nix | 4 ++-- nixos/modules/services/monitoring/graphite.nix | 8 ++++---- nixos/modules/services/monitoring/munin.nix | 2 +- nixos/modules/services/network-filesystems/samba.nix | 6 +++--- nixos/modules/tasks/filesystems/zfs.nix | 2 +- nixos/modules/virtualisation/nova.nix | 8 ++++---- nixos/modules/virtualisation/xen-dom0.nix | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 7a6cc542273a..e7cbe7a28f36 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -131,7 +131,7 @@ in { users.extraGroups.pulse.gid = gid; systemd.services.pulseaudio = { - description = "PulseAudio system-wide server"; + description = "PulseAudio System-Wide Server"; wantedBy = [ "sound.target" ]; before = [ "sound.target" ]; path = [ cfg.package ]; diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 9a077d404920..7ab653dd19fd 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -161,7 +161,7 @@ in ''; systemd.services.venus = - { description = "Planet Venus, an awesome ‘river of news’ feed reader"; + { description = "Planet Venus Feed Reader"; path = [ pkgs.venus ]; script = "exec venus-planet ${configFile}"; serviceConfig.User = "${cfg.user}"; diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index b0714a3ce800..a70a66c2ba0b 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -28,7 +28,7 @@ with pkgs.lib; services.dbus.packages = [ pkgs.bluez ]; systemd.services."dbus-org.bluez" = { - description = "Bluetooth service"; + description = "Bluetooth Service"; serviceConfig = { Type = "dbus"; BusName = "org.bluez"; diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 114bad5c947e..58ec8a49694b 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -148,7 +148,7 @@ in # wall: cannot get tty name: Inappropriate ioctl for device # The message still gets through. systemd.services.apcupsd = { - description = "APC UPS daemon"; + description = "APC UPS Daemon"; wantedBy = [ "multi-user.target" ]; preStart = "mkdir -p /run/apcupsd/"; serviceConfig = { @@ -172,7 +172,7 @@ in before = [ "final.target" ]; wantedBy = [ "shutdown.target" ]; unitConfig = { - Description = "APC UPS killpower"; + Description = "APC UPS Kill Power"; ConditionPathExists = "/run/apcupsd/powerfail"; DefaultDependencies = "no"; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 61aa30e57e13..be57b8c5c03f 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -172,7 +172,7 @@ in { ]; systemd.services.carbonCache = mkIf cfg.carbon.enableCache { - description = "Graphite data storage backend"; + description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; @@ -190,7 +190,7 @@ in { }; systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator { - description = "Carbon data aggregator"; + description = "Carbon Data Aggregator"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; @@ -201,7 +201,7 @@ in { }; systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay { - description = "Carbon data relay"; + description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; @@ -212,7 +212,7 @@ in { }; systemd.services.graphiteWeb = mkIf cfg.web.enable { - description = "Graphite web interface"; + description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = { diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 42d5f61af308..153f49429029 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -182,7 +182,7 @@ in }) (mkIf nodeCfg.enable { systemd.services.munin-node = { - description = "Munin node, the agent process"; + description = "Munin Node"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.munin ]; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index e18d9d7b67b5..4f6fce6cd52e 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -57,7 +57,7 @@ let nssModulesPath = config.system.nssModules.path; daemonService = appName: args: - { description = "Samba Service daemon ${appName}"; + { description = "Samba Service Daemon ${appName}"; wantedBy = [ "samba.target" ]; partOf = [ "samba.target" ]; @@ -211,7 +211,7 @@ in systemd = { targets.samba = { - description = "Samba server"; + description = "Samba Server"; requires = [ "samba-setup.service" ]; after = [ "samba-setup.service" "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -222,7 +222,7 @@ in "samba-smbd" = daemonService "smbd" "-F"; "samba-winbindd" = daemonService "winbindd" "-F"; "samba-setup" = { - description = "Samba setup task"; + description = "Samba Setup Task"; script = setupScript; unitConfig.RequiresMountsFor = "/home/smbd /var/samba /var/log/samba"; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index efd546f3baa0..7c3c662eeac9 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -76,7 +76,7 @@ in }; systemd.services."zfs-mount" = { - description = "Mount zfs volumes"; + description = "Mount ZFS Volumes"; after = [ "zpool-import.service" ]; wantedBy = [ "local-fs.target" ]; serviceConfig = { diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index 05c68e2bbff9..e0d25183574e 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -113,7 +113,7 @@ in jobs.nova_objectstore = { name = "nova-objectstore"; - description = "Nova simple object store service"; + description = "Nova Simple Object Store Service"; startOn = "ip-up"; @@ -129,7 +129,7 @@ in jobs.nova_scheduler = { name = "nova-scheduler"; - description = "Nova scheduler service"; + description = "Nova Scheduler Service"; startOn = "ip-up"; @@ -140,7 +140,7 @@ in jobs.nova_compute = { name = "nova-compute"; - description = "Nova compute service"; + description = "Nova Compute Service"; startOn = "ip-up"; @@ -157,7 +157,7 @@ in jobs.nova_network = { name = "nova-network"; - description = "Nova network service"; + description = "Nova Network Service"; startOn = "ip-up"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 4c24c6a7826a..40f6929be4f0 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -107,7 +107,7 @@ in ''; jobs.xend = - { description = "Xen control daemon"; + { description = "Xen Control Daemon"; startOn = "stopped udevtrigger"; From e0b7eeb0ad17fac9a92e0106b31583b20845191b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 2 May 2013 15:27:11 +0200 Subject: [PATCH 147/760] uhd: new package UHD is USRP Hardware Driver (for Software Defined Radio). --- pkgs/development/tools/misc/uhd/default.nix | 56 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/tools/misc/uhd/default.nix diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix new file mode 100644 index 000000000000..b8cedb1abc40 --- /dev/null +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, cmake, pkgconfig, python, cheetahTemplate, orc, libusb1, boost }: + +# You need these udev rules to not have to run as root (copied from +# ${uhd}/share/uhd/utils/uhd-usrp.rules): +# +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" + +stdenv.mkDerivation rec { + name = "uhd-${version}"; + version = "3.5.2"; + + # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz + # and xxx.yyy.zzz. Hrmpf... + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"; + sha256 = "1h0v7l03gq7qz5dqivsg5v6s0r47gw5fbiv7wsic3fx07ndf7rcn"; + }; + + cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; + + buildInputs = [ cmake pkgconfig python cheetahTemplate orc libusb1 boost ]; + + # Build only the host software + preConfigure = "cd host"; + + # Firmware images are downloaded (pre-built) + uhdImagesName = "uhd-images_003.005.002-release"; + uhdImagesSrc = fetchurl { + url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; + sha256 = "1g8pj4vpfsy5arffd9qsw1z6vp8rlafgip6kdc9sscdh9y0zlzi1"; + }; + + postPhases = [ "installFirmware" ]; + + installFirmware = '' + tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out" + ''; + + meta = with stdenv.lib; { + description = "USRP Hardware Driver (for Software Defined Radio)"; + longDescription = '' + The USRP Hardware Driver (UHD) software is the hardware driver for all + USRP (Universal Software Radio Peripheral) devices. + + USRP devices are designed and sold by Ettus Research, LLC and its parent + company, National Instruments. + ''; + homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07f686d38806..d7bdeb2476f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3768,6 +3768,8 @@ let texi2html = callPackage ../development/tools/misc/texi2html { }; + uhd = callPackage ../development/tools/misc/uhd { }; + uisp = callPackage ../development/tools/misc/uisp { }; uncrustify = callPackage ../development/tools/misc/uncrustify { }; From 57071b221307168b4e823c1967dedbf3138e7de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 2 May 2013 12:04:17 +0200 Subject: [PATCH 148/760] Add fftwFloat => fftw composition with floating point Needed for Gnuradio (coming in next commit). --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7bdeb2476f1..efe0bff707c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4075,6 +4075,10 @@ let singlePrecision = false; }; + fftwFloat = callPackage ../development/libraries/fftw { + float = true; + }; + fftwSinglePrec = callPackage ../development/libraries/fftw { singlePrecision = true; }; From 25b822db3786ad3f59e27db679c521ce6cd29b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 2 May 2013 12:44:36 +0200 Subject: [PATCH 149/760] gnuradio: new package Add GNU Radio, the free & open-source software development toolkit that provides signal processing blocks to implement software radios. --- pkgs/applications/misc/gnuradio/default.nix | 76 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/misc/gnuradio/default.nix diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix new file mode 100644 index 000000000000..3c47e3bf8a82 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl +# core dependencies +, cmake, pkgconfig, git, boost, cppunit, fftw +# python wrappers +, python, swig2, numpy, scipy, matplotlib +# grc - the gnu radio companion +, cheetahTemplate, pygtk +# gr-wavelet: collection of wavelet blocks +, gsl +# gr-qtgui: the Qt-based GUI +, qt4, qwt, pyqt4 #, pyqwt +# gr-wxgui: the Wx-based GUI +, wxPython, lxml +# gr-audio: audio subsystems (system/OS dependent) +, alsaLib +# uhd: the Ettus USRP Hardware Driver Interface +, uhd +# gr-video-sdl: PAL and NTSC display +, SDL +, libusb1, orc, pyopengl +, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnuradio-${version}"; + version = "3.7.1"; + + src = fetchurl { + url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; + sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9"; + }; + + buildInputs = [ + cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 qwt + alsaLib SDL libusb1 uhd gsl makeWrapper + ]; + + propagatedBuildInputs = [ + cheetahTemplate numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable" + ''; + + # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* + # programs will not display anything. Yes, $MATPLOTLIBRC must point to the + # *dirname* where matplotlibrc is located, not the file itself. + # - GNU Radio core is C++ but the user interface (GUI and API) is Python, so + # we must wrap the stuff in bin/. + postInstall = '' + printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" + + for file in "$out"/bin/*; do + wrapProgram "$file" \ + --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ + --set MATPLOTLIBRC "$out/share/gnuradio" + done + ''; + + meta = with stdenv.lib; { + description = "Software Defined Radio (SDR) software"; + longDescription = '' + GNU Radio is a free & open-source software development toolkit that + provides signal processing blocks to implement software radios. It can be + used with readily-available low-cost external RF hardware to create + software-defined radios, or without hardware in a simulation-like + environment. It is widely used in hobbyist, academic and commercial + environments to support both wireless communications research and + real-world radio systems. + ''; + homepage = http://www.gnuradio.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efe0bff707c5..f462c62b4f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7779,6 +7779,11 @@ let geany = callPackage ../applications/editors/geany { }; + gnuradio = callPackage ../applications/misc/gnuradio { + inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; + fftw = fftwFloat; + }; + goldendict = callPackage ../applications/misc/goldendict { }; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; From 78c76daf1643ce0e38e51211b8f7792711f1e7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 9 Nov 2013 23:02:37 +0100 Subject: [PATCH 150/760] gutenprint: upgrade to 5.2.9 --- pkgs/misc/drivers/gutenprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 79b819c12a7e..9a1c46e922b4 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -3,7 +3,7 @@ , libtiff, libpng, openssl, gimp }: let - version = "5.2.7"; + version = "5.2.9"; inherit (composableDerivation) edf wwf; in @@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} { src = fetchurl { url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2"; - sha256 = "1lgf7d9vsszv0bzgsd8j3x5smby1lpk07d8x7isv1sz34y98jk0i"; + sha256 = "185wai9hk0z0144hpxn5mqncy6xikc4bdv49vxqh5lrjdzqf89sb"; }; # gimp, gui is still not working (TODO) From 80e2706e51cad94cefa7c020e84455e7664b8602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 00:32:17 +0100 Subject: [PATCH 151/760] gutenprint: fix the cupsd driver --- pkgs/misc/drivers/gutenprint/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 9a1c46e922b4..77b3a22f4648 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,6 +1,6 @@ # this package was called gimp-print in the past { fetchurl, stdenv, pkgconfig, composableDerivation, cups -, libtiff, libpng, openssl, gimp }: +, libtiff, libpng, makeWrapper, openssl, gimp }: let version = "5.2.9"; @@ -16,7 +16,7 @@ composableDerivation.composableDerivation {} { }; # gimp, gui is still not working (TODO) - buildInputs = [ openssl pkgconfig ]; + buildInputs = [ makeWrapper openssl pkgconfig ]; configureFlags = ["--enable-static-genppd"]; NIX_CFLAGS_COMPILE="-include stdio.h"; @@ -37,6 +37,9 @@ composableDerivation.composableDerivation {} { installPhase = '' eval "make install $installArgs" + mkdir -p $out/lib/cups + ln -s $out/filter $out/lib/cups/ + wrapProgram $out/filter/rastertogutenprint.5.2 --prefix LD_LIBRARY_PATH : $out/lib ''; meta = { From edfd4cbb03d659ab372cbc2ca65c352ae0f56de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 16:11:47 +0100 Subject: [PATCH 152/760] libvirtd: add missing dependency on dnsmasq Fixes this: Nov 09 16:13:27 nixos-laptop systemd[1]: Starting Libvirt Virtual Machine Management Daemon... Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: libvirt version: 1.1.4 Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory Nov 09 16:13:28 nixos-laptop systemd[1]: Started Libvirt Virtual Machine Management Daemon. --- pkgs/development/libraries/libvirt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8431b1823e13..40fbbc94afdb 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng +, dnsmasq }: let version = "1.1.4"; in @@ -21,7 +22,7 @@ stdenv.mkDerivation { preConfigure = '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references ''; From b9f5b880e7893227b13c707d03bbafaf0f620855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Nov 2013 16:31:10 +0100 Subject: [PATCH 153/760] nixos/libvirtd-service: fix for dnsmasq (dir perms 700 -> 755) Fixes this: Nov 09 16:18:54 nixos-laptop systemd[1]: Starting Libvirt Virtual Machine Management Daemon... Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: read /etc/hosts - 2 addresses Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: failed to load names from /var/lib/libvirt/dnsmasq/default.addnhosts: Permission denied Nov 09 16:18:54 nixos-laptop dnsmasq[15809]: cannot read /var/lib/libvirt/dnsmasq/default.hostsfile: Permission denied Nov 09 16:18:55 nixos-laptop systemd[1]: Started Libvirt Virtual Machine Management Daemon. I don't understand the reason for the original 700 permission bits. Apparently read-access is needed and Ubuntu also use 755 perms. Use "chmod" instead of "mkdir -m" to set permissions because mkdir doesn't modify permissions on existing directories. --- nixos/modules/virtualisation/libvirtd.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d3884a503bc7..552441f6a62d 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -82,8 +82,11 @@ in mkdir -p /var/log/libvirt/qemu -m 755 rm -f /var/run/libvirtd.pid - mkdir -p /var/lib/libvirt -m 700 - mkdir -p /var/lib/libvirt/dnsmasq -m 700 + mkdir -p /var/lib/libvirt + mkdir -p /var/lib/libvirt/dnsmasq + + chmod 755 /var/lib/libvirt + chmod 755 /var/lib/libvirt/dnsmasq # Libvirt unfortunately writes mutable state (such as # runtime changes to VM, network or filter configurations) From 7fded05cbea79152103e73df2fcbb405ef64e234 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 10 Nov 2013 14:30:01 +0100 Subject: [PATCH 154/760] New package: LDM - Lightweight device mounter Signed-off-by: Moritz Ulrich --- pkgs/os-specific/linux/ldm/default.nix | 38 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/linux/ldm/default.nix diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix new file mode 100644 index 000000000000..df98b5260c6b --- /dev/null +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, udev, utillinux, mountPath ? "/media/" }: + +assert mountPath != ""; + +let + name = "ldm-0.4.2"; +in +stdenv.mkDerivation { + inherit name; + + # There is a stable release, but we'll use the lvm branch, which + # contains important fixes for LVM setups. + src = fetchgit { + url = "https://github.com/LemonBoy/ldm.git"; + rev = "26633ce07b"; + sha256 = "bb733d3b9b3bd5843b9cf1507a04a063c5aa45b398480411709fc727ae10b8b1"; + }; + + buildInputs = [ udev utillinux ]; + + preBuild = '' + substituteInPlace ldm.c \ + --replace "/mnt/" "${mountPath}" + ''; + + installPhase = '' + mkdir -p $out/bin + cp -v ldm $out/bin + ''; + + meta = { + description = "A lightweight device mounter, with libudev as only dependency"; + license = "MIT"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f462c62b4f20..95e3babe777e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6567,6 +6567,8 @@ let latencytop = callPackage ../os-specific/linux/latencytop { }; + ldm = callPackage ../os-specific/linux/ldm { }; + libaio = callPackage ../os-specific/linux/libaio { }; libatasmart = callPackage ../os-specific/linux/libatasmart { }; From f4f18c11b6bbdfb8c1716a204fda400106fbb4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 10 Nov 2013 15:44:15 +0100 Subject: [PATCH 155/760] uhd: bump 3.5.2 -> 3.5.4 It seems upstream changed the hash of the 3.5.2 archive so it doesn't build anymore. Bump it instead of just updating the hash. --- pkgs/development/tools/misc/uhd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index b8cedb1abc40..d49077a5ef6d 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { name = "uhd-${version}"; - version = "3.5.2"; + version = "3.5.4"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... src = fetchurl { name = "${name}.tar.gz"; - url = "https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"; - sha256 = "1h0v7l03gq7qz5dqivsg5v6s0r47gw5fbiv7wsic3fx07ndf7rcn"; + url = "https://github.com/EttusResearch/uhd/archive/release_003_005_004.tar.gz"; + sha256 = "1l11dv72r4ynfpw58aacq0kjylzw85yapv3kzc76lg6qgdb0pqrd"; }; cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { preConfigure = "cd host"; # Firmware images are downloaded (pre-built) - uhdImagesName = "uhd-images_003.005.002-release"; + uhdImagesName = "uhd-images_003.005.004-release"; uhdImagesSrc = fetchurl { url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; - sha256 = "1g8pj4vpfsy5arffd9qsw1z6vp8rlafgip6kdc9sscdh9y0zlzi1"; + sha256 = "0lgy9076vshlaq7l4n3q1hka3q4xxzdz7mqh7kawg4dziq7j8nl6"; }; postPhases = [ "installFirmware" ]; From 72aae985ae0ae8972859a3fbb9b45d4cb86f2822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 16:27:02 +0100 Subject: [PATCH 156/760] gutenprint: wrap sbin/cups-genppd.5.2 This is used to generate ppd files for cups: $ cups-genppd.5.2 -M | grep p50 canon-cp500 escp2-p50 $ cups-genppd.5.2 -p . escp2-p50 This will create the relevant ppd file in the current directory. This can then be used by cups after setting services.drivers.drivers = [pkgs.gutenprint]; and configuring the printer to use this ppd e.g. via the web interface on http://localhost:631 --- pkgs/misc/drivers/gutenprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 77b3a22f4648..ebec9867a615 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -40,6 +40,7 @@ composableDerivation.composableDerivation {} { mkdir -p $out/lib/cups ln -s $out/filter $out/lib/cups/ wrapProgram $out/filter/rastertogutenprint.5.2 --prefix LD_LIBRARY_PATH : $out/lib + wrapProgram $out/sbin/cups-genppd.5.2 --prefix LD_LIBRARY_PATH : $out/lib ''; meta = { From 2099a814871912ecbc844f2373e722ac6a8b0d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 10 Nov 2013 17:46:00 +0100 Subject: [PATCH 157/760] xawtv: 3.95 -> 3.103 - package now builds on linux - added linux platforms - removed patches --- pkgs/applications/video/xawtv/default.nix | 32 ++++++++++---- .../video/xawtv/xawtv-3.95-libfs.patch | 22 ---------- .../video/xawtv/xawtv-3.95-makefile.patch | 21 --------- .../video/xawtv/xawtv-3.95-page-mask.patch | 44 ------------------- 4 files changed, 24 insertions(+), 95 deletions(-) delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 5f2e905efa09..63c1adb15e42 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,15 +1,31 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xproto, libv4l +, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: -stdenv.mkDerivation { - name = "xawtv-3.95"; +stdenv.mkDerivation rec { + name = "xawtv-3.103"; src = fetchurl { - url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz; - md5 = "ad25e03f7e128b318e392cb09f52207d"; + url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + sha256 = "0lnxr3xip80g0rz7h6n14n9d1qy0cm56h0g1hsyr982rbldskwrc"; }; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${linux}/lib/modules/*/build/include)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build" ''; - buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto]; - patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch ./xawtv-3.95-page-mask.patch ]; + + configureFlags="--prefix="; + NIX_LDFLAGS="-lgcc_s"; + + makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; + + buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS perl alsaLib aalib + fontsproto libXaw libXpm libXext libSM libICE xextproto libv4l]; + + meta = { + description = "TV application for Linux with apps and tools such as a teletext browser"; + license = stdenv.lib.licenses.gpl2; + homePage = https://www.kraxel.org/blog/linux/xawtv/; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch b/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch deleted file mode 100644 index 4555f1058672..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN xawtv-3.95/console/fs.h xawtv-3.95.new/console/fs.h ---- xawtv-3.95/console/fs.h 2003-02-14 15:14:04.000000000 +0100 -+++ xawtv-3.95.new/console/fs.h 2006-01-03 22:16:06.000000000 +0100 -@@ -1,5 +1,5 @@ - #ifndef X_DISPLAY_MISSING --# include -+# include - - struct fs_font { - Font font; -diff -ruN xawtv-3.95/console/Subdir.mk xawtv-3.95.new/console/Subdir.mk ---- xawtv-3.95/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 -+++ xawtv-3.95.new/console/Subdir.mk 2006-01-03 22:32:38.000000000 +0100 -@@ -74,7 +74,7 @@ - # libraries to link - console/fbtv : LDLIBS += \ - $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ -- $(FS_LIBS) -ljpeg -lm -+ $(FS_LIBS) -ljpeg -lm -lFS - console/ttv : LDLIBS += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm - console/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg - console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch deleted file mode 100644 index 271bb4c7e5c0..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN xawtv-3.95/Makefile.in xawtv-3.95.new/Makefile.in ---- xawtv-3.95/Makefile.in 2004-04-22 16:52:29.000000000 +0200 -+++ xawtv-3.95.new/Makefile.in 2006-01-20 13:07:00.000000000 +0100 -@@ -3,7 +3,7 @@ - - # for package builds (buildroot install + no root privs needed) - DESTDIR= --SUID_ROOT=-m4755 -o root -+SUID_ROOT= - - # install paths - prefix := @prefix@ -@@ -12,7 +12,7 @@ - mandir := $(DESTDIR)@mandir@ - libdir := $(DESTDIR)@libdir@/xawtv - datadir := $(DESTDIR)@datadir@/xawtv --resdir := $(DESTDIR)@resdir@ -+resdir := $(out)@resdir@ - config := @x11conf@/xawtvrc - - # programs diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch b/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch deleted file mode 100644 index 5714e8238e67..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix problems with fbtv and kernel headers - -diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c ---- xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 -+++ xawtv-3.95/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 -@@ -21,8 +21,6 @@ - #include - #include - --#include -- - #include "fbtools.h" - - /* -------------------------------------------------------------------- */ -@@ -424,7 +422,7 @@ - goto err; - } - #endif -- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); -+ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1); - fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, - PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); - if (-1L == (long)fb_mem) { -diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c ---- xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 -+++ xawtv-3.95/console/matrox.c 2006-08-23 11:09:51.000000000 +0000 -@@ -9,7 +9,6 @@ - #include - #include - --#include /* PAGE_SIZE */ - #include - - #include "byteswap.h" -@@ -226,7 +225,7 @@ - return -1; - } - off = (unsigned long)fb_fix.mmio_start - -- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); -+ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); - bmmio += off; - mmio = (uint32_t*)bmmio; - return 0; - From 01fed132fc1d1a40365ed33c208bb22046ebdfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 10 Nov 2013 18:25:12 +0100 Subject: [PATCH 158/760] remmina: add meta.platforms --- pkgs/applications/networking/remote/remmina/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 0d7092280da2..24bc20af6528 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -41,10 +41,11 @@ stdenv.mkDerivation { wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; - meta = { + meta = with stdenv.lib; { license = "GPLv2"; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; + platforms = platforms.linux; }; } From d9f1ed063b7fc60f074a07fea676b3e05c989b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 10 Nov 2013 21:02:48 +0100 Subject: [PATCH 159/760] pciutils: minor update to today's version --- pkgs/tools/system/pciutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 93486d3decf2..25201ba97abc 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,16 +8,16 @@ let }; in stdenv.mkDerivation rec { - name = "pciutils-3.2.0"; + name = "pciutils-3.2.1"; # with database from 2013-11-10 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq"; + sha256 = "1pnwwc4sq0q7zz3mw2rsrc9j5rxwpdvxirqjmxcd0brf0hcjpm8j"; }; buildInputs = [ pkgconfig zlib kmod which ]; - preBuild = "bunzip2 < ${pciids} > pci.ids"; + #preBuild = "bunzip2 < ${pciids} > pci.ids"; makeFlags = "SHARED=yes PREFIX=\${out}"; From bc368053ea985ef647c048d58e561f459e7db69b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 17:21:49 +0100 Subject: [PATCH 160/760] gimp: change default from 2.6 to 2.8 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95e3babe777e..23612638ceb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7901,7 +7901,7 @@ let lcms = lcms2; }; - gimp = gimp_2_6; + gimp = gimp_2_8; gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { inherit pkgs gimp; From f9520337d09a5cb1d0bb22d5766adee17b982203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 17:44:02 +0100 Subject: [PATCH 161/760] gimpPlugins.ufraw: update plugin from 0.15 to 0.19.2 to build with gimp 2.8 --- pkgs/applications/graphics/gimp/plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index d314d93ea4c3..8b2a4a660564 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -170,9 +170,9 @@ rec { # this is more than a gimp plugin ! # either load the raw image with gimp (and the import dialog will popup) # or use the binary - ufraw = pluginDerivation { - name = "ufraw-0.15"; - buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs; + ufraw = pluginDerivation rec { + name = "ufraw-0.19.2"; + buildInputs = [pkgs.gtkimageview pkgs.lcms gimp] ++ gimp.nativeBuildInputs; # --enable-mime - install mime files, see README for more information # --enable-extras - build extra (dcraw, nikon-curve) executables # --enable-dst-correction - enable DST correction for file timestamps. @@ -184,8 +184,8 @@ rec { configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; src = fetchurl { - url = mirror://sourceforge/ufraw/ufraw-0.15.tar.gz; - sha256 = "0cf3csksjkyl91zxhjnn74vc31l14nm6n1i02s76xdvvkk9ics8k"; + url = "mirror://sourceforge/ufraw/${name}.tar.gz"; + sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; }; installPhase = " installPlugins ufraw-gimp From f5e92ce8f2a3e7116b56107635a82c532a3f9a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 20:00:37 +0100 Subject: [PATCH 162/760] gimpPlugins.texturize: fix compilation with gimp 2.8 --- pkgs/applications/graphics/gimp/plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 8b2a4a660564..e8a809d11437 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -110,6 +110,9 @@ rec { url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; }; + patchPhase = '' + sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c* + ''; installPhase = "installPlugins src/texturize"; }; From b8bbc87ab16882ba0eb98d4e6ac3c58a980fd1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 20:16:37 +0100 Subject: [PATCH 163/760] gimpPlugins.fourier: upgrade from 0.3.3 to 0.4.1 and fix compilation --- pkgs/applications/graphics/gimp/plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index e8a809d11437..ef9060d00c3e 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -68,18 +68,18 @@ rec { }; }; - fourier = pluginDerivation { + fourier = pluginDerivation rec { /* menu: Filters/Generic/FFT Forward Filters/Generic/FFT Inverse */ - name = "fourier-0.3.3"; - buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs; + name = "fourier-0.4.1"; + buildInputs = [ gimp pkgs.fftw pkgconfig glib] ++ gimp.nativeBuildInputs; postInstall = "fail"; installPhase = "installPlugins fourier"; src = fetchurl { - url = http://people.via.ecp.fr/~remi/soft/gimp/fourier-0.3.3.tar.gz; - sha256 = "0xxgp0lrjxsj54sgygi31c7q41jkqzn0v18qyznrviv8r099v29p"; + url = "http://registry.gimp.org/files/${name}.tar.gz"; + sha256 = "1pr3y3zl9w8xs1circdrxpr98myz9m8wfzy022al79z4pdanwvs1"; }; }; From 01266013a5975511cf80b535ad7c650d62764185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 10 Nov 2013 23:33:45 +0100 Subject: [PATCH 164/760] gimpPlugins.gmic: upgrade from 1.3.2.0 to 1.5.7.4, fix compilation with gimp 2.8 Only the gimp plugin is built now, as the rest of the suite is quite large and probably deserves its own package. --- .../graphics/gimp/plugins/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ef9060d00c3e..234249e85626 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -143,21 +143,23 @@ rec { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - # this is more than a gimp plugin ! - # it can be made to compile the gimp plugin only though.. gmic = - let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? - in pluginDerivation { - name = "gmic-1.3.2.0"; - buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs; + let + imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? + fftw = pkgs.fftw.override {pthreads = true;}; + in pluginDerivation rec { + name = "gmic-1.5.7.2"; + buildInputs = [imagemagick pkgconfig fftw gimp] ++ gimp.nativeBuildInputs; src = fetchurl { - url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz; - sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h"; + url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz; + sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick" ''; - installPhase = "installPlugins src/gmic4gimp"; + sourceRoot = "${name}/src"; + buildPhase = "make gimp"; + installPhase = "installPlugins gmic_gimp"; meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; From 774a0b4a009b6c96ee5f51fff69d477c9101fa10 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:44:11 +0000 Subject: [PATCH 165/760] sdlmame: update to latest version --- pkgs/games/sdlmame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 645312dd54e9..acc724490181 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -3,17 +3,17 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - version = "0.150.u0-1"; + version = "0.151.u0-1"; name = "sdlmame-${version}"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "ftp://ftp.archlinux.org/community/os/x86_64/${name}-x86_64.pkg.tar.xz"; - sha256 = "0393xnzrzq53szmicn96lvapm66wmlykdxaa1n7smx8a0mcz0kah"; + sha256 = "1j9vjxhrhsskrlk5wr7al4wk2hh3983kcva42mqal09bmc8qg3m9"; } else fetchurl { url = "ftp://ftp.archlinux.org/community/os/i686/${name}-i686.pkg.tar.xz"; - sha256 = "0js67w2szd0qs7ycgxb3bbmcdziv1fywyd9ihra2f6bq5rhcs2jp"; + sha256 = "1i38j9ml66pyxzm0zzf1fv4lb40f6w47cdgaw846q91pzakkkqn7"; }; buildPhase = '' From 311a25648b4d2f9b938d0e6d862c4a6114305fe2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:57:40 +0000 Subject: [PATCH 166/760] mpd: update to latest version --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 238176aadff9..67a11e01651a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.17.4"; + name = "mpd-0.18.3"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3"; + url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; + sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh"; }; buildInputs = [ pkgconfig glib ] From d6800031572a616962a8bc9f50e6b6616be6de21 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 01:40:17 +0000 Subject: [PATCH 167/760] awesome: add which to build inputs (for awesome-client) --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 61f2145ff33c..d29aec9976f0 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua +{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils}: +, docbook_xml_dtd_45, libxslt, coreutils, which }: let version = "3.4.13"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as From cec700aab058db238176f591e1b919f30da54ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 11 Nov 2013 09:53:17 +0100 Subject: [PATCH 168/760] Updating ts to 0.7.4. --- pkgs/tools/system/ts/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index a392ed0bcfd3..6d1c6ad5e1ff 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, +sendmailPath ? "/var/setuid-wrappers/sendmail" }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ts-0.7.3"; + name = "ts-0.7.4"; installPhase=''make install "PREFIX=$out"''; @@ -10,9 +11,13 @@ stdenv.mkDerivation { makeFlags = "CC=${stdenv.cross.config}-gcc"; }; + patchPhase = '' + sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1 + ''; + src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.3.tar.gz; - sha256 = "1ajgk6y9y9bng5ssdqxwpzw44pmib30vn5284rgga6vr04ppakdy"; + url = "http://viric.name/~viric/soft/ts/${name}.tar.gz"; + sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs"; }; meta = { From 6441a9c1d08a0c309f7a85980b9ad86f2d84ecd5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Nov 2013 11:22:41 +0100 Subject: [PATCH 169/760] Don't set the default channel to 13.10 when installing from master Partial revert of 619a1f561480a300ce28f0f471e73fecda85fd60. --- nixos/modules/misc/version.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 41f75483f951..ae9fb5fb2a0e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -33,7 +33,7 @@ with pkgs.lib; system.defaultChannel = mkOption { internal = true; type = types.str; - default = https://nixos.org/channels/nixos-13.10; + default = https://nixos.org/channels/nixos-unstable; description = "Default NixOS channel to which the root user is subscribed."; }; From 1e80c57274b7e2877ac554b5a51f868253fafdc1 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 9 Nov 2013 17:14:05 -0430 Subject: [PATCH 170/760] scala: add expression for scala 2.10.x branch. --- pkgs/development/compilers/scala/2.9.nix | 34 ++++++++++++++++++++ pkgs/development/compilers/scala/default.nix | 17 ++++++---- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/compilers/scala/2.9.nix diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix new file mode 100644 index 000000000000..a7c9dbc90736 --- /dev/null +++ b/pkgs/development/compilers/scala/2.9.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +# at runtime, need jre or jdk + +stdenv.mkDerivation rec { + name = "scala-2.9.2"; + + src = fetchurl { + url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; + sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + }; + + installPhase = '' + mkdir -p $out + rm bin/*.bat + rm lib/scalacheck.jar + mv * $out + ''; + + meta = { + description = "Scala is a general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = http://www.scala-lang.org/; + license = "BSD"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a7c9dbc90736..c128baf5100f 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.9.2"; + name = "scala-2.10.3"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; - sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "16ac935wydrxrvijv4ldnz4vl2xk8yb3yzb9bsi3nb9sic7fxl95"; }; + buildInputs = [ jre makeWrapper ] ; + installPhase = '' mkdir -p $out rm bin/*.bat - rm lib/scalacheck.jar mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23612638ceb2..52a6ef0764ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3007,7 +3007,9 @@ let inherit makeWrapper clisp; }; - scala = callPackage ../development/compilers/scala { }; + scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; + scala_2_10 = callPackage ../development/compilers/scala { }; + scala = scala_2_10; sdcc = callPackage ../development/compilers/sdcc { boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53 From 53cc2aa312bc08643dbc704d9086a5e693a7ca54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:42 +0100 Subject: [PATCH 171/760] haskell-parsers: update to version 0.10.1.1 --- .../libraries/haskell/parsers/{0.10.nix => 0.10.1.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/parsers/{0.10.nix => 0.10.1.1.nix} (83%) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix similarity index 83% rename from pkgs/development/libraries/haskell/parsers/0.10.nix rename to pkgs/development/libraries/haskell/parsers/0.10.1.1.nix index 529fdf47124c..db79c81a62d4 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.10"; - sha256 = "090dvmdb1kmnc3k2x170y9fdifxi16hzkij1gzc51flx3bpx40i1"; + version = "0.10.1.1"; + sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a"; buildDepends = [ charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 50ee769e7d4a..56ddf1a475a5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1654,8 +1654,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10 = callPackage ../development/libraries/haskell/parsers/0.10.nix {}; - parsers = self.parsers_0_10; + parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {}; + parsers = self.parsers_0_10_1_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From d72afe2f1b66486c59bddeca88402f30076932a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 172/760] haskell-github-backup: update to version 1.20131101 --- .../git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 557886a4deb1..0752504278be 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20131006"; - sha256 = "0yc2hszi509mc0d6245dc8cq20mjjmr8mgrd8571dy9sgda532pf"; + version = "1.20131101"; + sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; isLibrary = false; isExecutable = true; buildDepends = [ From c1d17c070f61e3bd27414ce57a10da079f77294f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 173/760] haskell-Chart-cairo: update to version 1.1 --- .../libraries/haskell/Chart-cairo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 99ab741be492..e28ff279083b 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -1,13 +1,13 @@ -{ cabal, cairo, Chart, colour, dataDefaultClass, mtl, operational -, time +{ cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl +, operational, time }: cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.0"; - sha256 = "0z5qhsq9v5sd32d18gl09svxic8n6s65v4nyq04zcp76219mhp55"; + version = "1.1"; + sha256 = "0pm8iwd83pn5ba0g3231zs7f39cdjr7n7k76cm642n4b0hf93fmb"; buildDepends = [ - cairo Chart colour dataDefaultClass mtl operational time + cairo Chart colour dataDefaultClass lens mtl operational time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; From 6af70de21a1de6a487db745633e3e78083f0238c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 174/760] haskell-Chart-gtk: update to version 1.1 --- pkgs/development/libraries/haskell/Chart-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index d97fdc21f035..0c2534c4c3bc 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.0"; - sha256 = "06i53922hdc7dvh2a76ccvwrwfhvhji0ya8j4f2lddg5zckvp3yj"; + version = "1.1"; + sha256 = "1394h7jd8pk55396nz1xjisz4v7brqcf9fwdnw9g4q3x1b7dcgs8"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; From 0f09271562ee858c9483a3b920cdcffb0094101f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 175/760] haskell-Chart: update to version 1.1 --- pkgs/development/libraries/haskell/Chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 0d9dd690758e..50459dfa0076 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.0"; - sha256 = "137njda84vxrj3pk12bmkf11wh8fj89nxpz067wrycrgw9xy5rd3"; + version = "1.1"; + sha256 = "136s44mbhf3wmg85rr9qr0kv59lq1lfd3l58a5aijpv9vz1isf7p"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; From 3a922b76f79d7b8ce5c8d4abaf72fe7c5bf812b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 176/760] haskell-accelerate-cuda: update to version 0.13.0.4 --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 49cb597b2a5d..d7e11f11ef04 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - hydraPlatforms = []; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From c99c70dd8ecb9df40389485a19fcdd5c6bdd4ae1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 177/760] haskell-accelerate-examples: update to version 0.13.0.0 --- .../libraries/haskell/accelerate-examples/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 8cb5433726ff..e48abc543f8d 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - hydraPlatforms = []; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 226f77345707e88dedda2a2e7331e85eb0fec26d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 178/760] haskell-accelerate-fft: update to version 0.13.0.0 --- pkgs/development/libraries/haskell/accelerate-fft/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index ef378faa08fd..523e5ae1504c 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - hydraPlatforms = []; + platforms = self.ghc.meta.platforms; }; }) From 8b863aab400f614e0617eeb80faf0c4b399c11dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 179/760] haskell-active: update to version 0.1.0.9 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 1d6df75e5fa3..322e411db8ed 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.8"; - sha256 = "1q2zrx1i5j04c9bss7c19nm6lqasmwxyfzkh49my7yaik95k7bw9"; + version = "0.1.0.9"; + sha256 = "0639qp4yc3dfvc9xcjk9k7qagvbcjwdgz3lklqsak9h551ccl7bv"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From 096e81f5a059dfbfbf03f4dba74779bf412f53a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 180/760] haskell-crypto-numbers: update to version 0.2.2 --- pkgs/development/libraries/haskell/crypto-numbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 68deb8e3472e..7080611f9c47 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.2.1"; - sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq"; + version = "0.2.2"; + sha256 = "1ia39al01hb65h23ql0mr5vwzj8slv98i7a22cix8p0b6an1w3vv"; buildDepends = [ cryptoRandom vector ]; testDepends = [ byteable cryptoRandom HUnit QuickCheck testFramework From 9a615b6d9c2f3c7d6940cc6223907e69a40ee54b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 181/760] haskell-cuda: update to version 0.5.0.2 --- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 98d97c82e514..53eeeb6970eb 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -33,7 +33,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - hydraPlatforms = []; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From def8a6801c0466e0f61658f3f95b7b5b002f3758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: [PATCH 182/760] haskell-cufft: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 9de2cf9f80aa..76039f065488 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - hydraPlatforms = []; + platforms = self.ghc.meta.platforms; }; }) From c01cb9d67cf089aa43205d46ca0244035da2bfb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 183/760] haskell-dbus: update to version 0.10.5 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index e0072bd8446b..a96f1499f974 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.4"; - sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f"; + version = "0.10.5"; + sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes From de03376a13cfc43600472587d4b64dd7f6208b4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 184/760] haskell-lifted-base: update to version 0.2.1.1 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index dc970925f982..cfa51bd39aac 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.1.0"; - sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy"; + version = "0.2.1.1"; + sha256 = "062mdh364c4adnyc3l037zi1aaqvgm43g1x6vf3pjb75c3sayc5k"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; From 9a904615a999006181ce48852028f5bf781a570a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 185/760] haskell-pipes-parse: update to version 2.0.2 --- pkgs/development/libraries/haskell/pipes-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 33892ef8fc62..61c0f34a57ef 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "2.0.1"; - sha256 = "04sqjdmgkgk5qva0gyrblhdvmljgmci2yzzw7y17pmnwxwdja4f0"; + version = "2.0.2"; + sha256 = "1jcws5i9jhh4i6bh2j6m9pz1462qm05byibkkxfqvyx392sxy4wz"; buildDepends = [ free pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; From c00944712d46fa510d699bc3974ab7f4e188ecbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 186/760] haskell-tasty: update to version 0.4 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index df14857f9ab3..07e4be2f0b78 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.3.1"; - sha256 = "0ipndrpywzg40s5hiwyyly29mcppcfqbbpwqqp4apma57m8cdpb0"; + version = "0.4"; + sha256 = "1gcaam49nm6fx0i2hlf1zih4rxzfgnsl4xiwnqifhz9m15n5laxq"; buildDepends = [ ansiTerminal mtl optparseApplicative regexPosix stm tagged ]; From 67a59ade44833dd5ab9ed6c7eb5ae234a8e2abe6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 187/760] haskell-texmath: update to version 0.6.5.1 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index cb346ac7d27d..3a6acb7a3cc3 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.4"; - sha256 = "090xqs14ap3c6pljqzyva46phxb1lhqayi4g098f6d77d1ygvshf"; + version = "0.6.5.1"; + sha256 = "022gpxamc31p9gsk9bxf04qyvcdbdiwj617l5z04q21lj0758wzk"; isLibrary = true; isExecutable = true; buildDepends = [ pandocTypes parsec syb xml ]; From fb89b4fb0ae039306ce06128dbda48fd05a7d55b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:52 +0100 Subject: [PATCH 188/760] haskell-wai-extra: update to version 1.3.4.6 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9789c80e8c16..7e3424713e0d 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.5"; - sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj"; + version = "1.3.4.6"; + sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes From e127d7a0a6e899c470b23049ccaca48adddfb068 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 10:29:44 +0100 Subject: [PATCH 189/760] haskell-dual-tree: update to version 0.2 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index c0896557e339..218855f322e8 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.4"; - sha256 = "0xrpb7kz6aazqy9w0b7hcbxgmy4ddy0zh7gdpv2w140vvyx5qjrn"; + version = "0.2"; + sha256 = "0wasnjkixl6zkskjp18qj3jym3yv3a85i3w5qphgjr3xifbzwnjf"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From ccd4ca7c418a0c6ca33a08c132b7c3923860f552 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 15:47:44 +0100 Subject: [PATCH 190/760] haskell-abstract-par: update to version 0.3.3 --- pkgs/development/libraries/haskell/abstract-par/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index 033fc242321d..537df70390ca 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "abstract-par"; - version = "0.3.1"; - sha256 = "0qzv520823b07hrr49rnpzayh96m6cjrmb1cn9l0dn80j6k9xayk"; + version = "0.3.3"; + sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/simonmar/monad-par"; From fb621b1724c4fc402a7774388f064f0a754c0144 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 15:47:45 +0100 Subject: [PATCH 191/760] haskell-cuda: update to version 0.5.1.0 --- pkgs/development/libraries/haskell/cuda/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 53eeeb6970eb..fbe0ec0a20cf 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.5.0.2"; - sha256 = "1if730wcww5qx5qki1ir0d576wwpwrh00krp1svgdlx2j50rmgq5"; + version = "0.5.1.0"; + sha256 = "1zsfsz8i05iq54wxj1maj6qqzv4ibr459h47knc7ds1qv4giwzhl"; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; @@ -31,6 +31,7 @@ cabal.mkDerivation (self: { ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags ''; meta = { + homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2176c172ca484b4bad54b39a757649b7fbf4c011 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 15:47:45 +0100 Subject: [PATCH 192/760] haskell-hxt: update to version 9.3.1.2 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 35783c7762ef..071471d906e2 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.3.1.1"; - sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y"; + version = "9.3.1.2"; + sha256 = "0v4j9z65sbjs44n1ijy14f0l2swva6jqz89x2ibf89q8bx36sj6n"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec From dbffabdee6b261935c6f860548ddbf0ce82df810 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 15:47:45 +0100 Subject: [PATCH 193/760] haskell-parseargs: update to version 0.1.5.2 --- pkgs/development/libraries/haskell/parseargs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 2a481246e885..a421338624cd 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "parseargs"; - version = "0.1.3.5"; - sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc"; + version = "0.1.5.2"; + sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://wiki.cs.pdx.edu/bartforge/parseargs"; + homepage = "http://github.com/BartMassey/parseargs"; description = "Command-line argument parsing library for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2a98488609cae214f99a605c5eac6526956ecb94 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Nov 2013 15:47:45 +0100 Subject: [PATCH 194/760] haskell-snap-core: update to version 0.9.5.0 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 52da653da3e3..e35241d46ece 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.4.1"; - sha256 = "0yacbpd20y49jw1qkrm5r4qick0fhimgb07883bg1lp3ai4ysrk5"; + version = "0.9.5.0"; + sha256 = "1i5xmgfy807rm6f47l7p7z99nw9bq8vldlfvzi1gxzz8ic80slm4"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable From 9e036f4560d6af2342d9d503f89e78242b5ed007 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:29:42 +0100 Subject: [PATCH 195/760] haskell-deepseq: update to 1.3.0.1 --- .../libraries/haskell/deepseq/{1.3.0.1.nix => 1.3.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/deepseq/{1.3.0.1.nix => 1.3.0.2.nix} (76%) diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix similarity index 76% rename from pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix rename to pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix index 78f9273e46a2..3c6ce781dc29 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq"; - version = "1.3.0.1"; - sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp"; + version = "1.3.0.2"; + sha256 = "09jnfz5158s4fvlfjbz44vb5jsvflagmsrgbk846arymwym6b7bp"; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 56ddf1a475a5..af22da515181 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -664,7 +664,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; - deepseq = self.deepseq_1_3_0_1; + deepseq = self.deepseq_1_3_0_2; }; Cabal = null; # core package in GHC @@ -858,7 +858,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; - deepseq_1_3_0_1 = callPackage ../development/libraries/haskell/deepseq/1.3.0.1.nix {}; + deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; deepseq = null; # a core package in recent GHCs deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; From 62fd4cebe1d0fa4d02ea3a852e8d71324b513ed5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:30:48 +0100 Subject: [PATCH 196/760] haskell-parallel: update to version 3.2.0.4 --- .../libraries/haskell/parallel/3.2.0.4.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.4.nix diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix new file mode 100644 index 000000000000..4f255e893af5 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "parallel"; + version = "3.2.0.4"; + sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc"; + buildDepends = [ deepseq ]; + meta = { + description = "Parallel programming library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af22da515181..f054d915df5d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,7 +158,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x network = self.network_2_4_2_0; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; - parallel = self.parallel_3_2_0_3; + parallel = self.parallel_3_2_0_4; parsec = self.parsec_3_1_3; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; @@ -1639,7 +1639,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; - parallel = self.parallel_3_2_0_3; + parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; + parallel = self.parallel_3_2_0_4; parallelIo = callPackage ../development/libraries/haskell/parallel-io {}; From 75ec0b31f83999bd094919e9e4588e3570038c62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:30:59 +0100 Subject: [PATCH 197/760] haskell-git-annex: update to version 4.20131106 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 394e7580771e..2506de8d14e4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131101"; - sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; + version = "4.20131106"; + sha256 = "019k3zhbc3wjg8isndw6hkgrr3h3qxrbfydv7m6zpgv2khjyhfh0"; isLibrary = false; isExecutable = true; buildDepends = [ From f25b2c1be6a545bf654b7d55d9d409e2b79c4bd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:31:00 +0100 Subject: [PATCH 198/760] haskell-HsOpenSSL: update to version 0.10.3.5 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 8df2209ffbf7..eb7c406e81e4 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.4"; - sha256 = "1xgnzivphnzb4yf31406yg5fjycrfypwrlxi2s8lfzgja8m1l7h5"; + version = "0.10.3.5"; + sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { From 7d97e8c9821fde907ab4a7f794c0fbb16a667f34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:31:00 +0100 Subject: [PATCH 199/760] haskell-texmath: update to version 0.6.5.2 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 3a6acb7a3cc3..a129ae46a35a 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.5.1"; - sha256 = "022gpxamc31p9gsk9bxf04qyvcdbdiwj617l5z04q21lj0758wzk"; + version = "0.6.5.2"; + sha256 = "1pvaf40avjx43ydhi9n6vkkjw9gk5apws4bgqqq2g601kvmi163l"; isLibrary = true; isExecutable = true; buildDepends = [ pandocTypes parsec syb xml ]; From 0cd6b6e896e9aba561bf871dbe0d8f0d3e0612bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:31:00 +0100 Subject: [PATCH 200/760] haskell-thyme: update to version 0.3.0.2 --- pkgs/development/libraries/haskell/thyme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index f40730b5e56e..187ad078c773 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.0.1"; - sha256 = "086i8cadq2s894157s1bh3zhd9zb9apr7w39gnydywzgkx47478h"; + version = "0.3.0.2"; + sha256 = "1drglcl3jv0kp51h72b8dlrr3hpsl480dv1gr4p0vnk6ynls98y6"; buildDepends = [ attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace From ad2d8fdfb9cf62b64468e1ef765d52c71d86cdec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 15:36:55 +0100 Subject: [PATCH 201/760] Don't override deepseq globally in Cabal 1.18.x. Deepseq is a core package, and building Cabal with a version that differs from the one shipped with GHC is probably not a good idea. For GHC 7.0.x, however, we must override deepseq, because the library just won't build otherwise. --- pkgs/top-level/haskell-defaults.nix | 3 +++ pkgs/top-level/haskell-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d2cfbf38f986..16803155b656 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -60,6 +60,7 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; + Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; }; ghc703Prefs = @@ -71,6 +72,7 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; + Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; }; ghc702Prefs = ghc701Prefs; @@ -84,6 +86,7 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; bmp = self.bmp_1_2_2_1; + Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; }; }; ghc6123Prefs = ghc6122Prefs; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f054d915df5d..a8028b9a3ad5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -662,10 +662,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { - cabal = self.cabal.override { Cabal = null; }; - deepseq = self.deepseq_1_3_0_2; - }; + Cabal_1_18_1_2 = callPackage ../development/libraries/haskell/Cabal/1.18.1.2.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; From 9537b2c8d24328e4257699e7ad0aa642525075b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:23 +0100 Subject: [PATCH 202/760] haskell-HList: update to version 0.2.3 --- pkgs/development/libraries/haskell/HList/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 35b03f77dde6..df2bfcf1f798 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, diffutils }: cabal.mkDerivation (self: { pname = "HList"; version = "0.2.3"; sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908"; + buildTools = [ diffutils ]; meta = { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; From cbaf1138582b61f44658b4566c4f9170096ba31b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 203/760] haskell-HsSyck: update to version 0.51 --- pkgs/development/libraries/haskell/HsSyck/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix index 56e999d7b83e..1c10075d13c6 100644 --- a/pkgs/development/libraries/haskell/HsSyck/default.nix +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb, utf8String }: +{ cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { pname = "HsSyck"; - version = "0.50"; - sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm"; - buildDepends = [ syb utf8String ]; + version = "0.51"; + sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49"; + buildDepends = [ hashtables syb utf8String ]; meta = { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; From 2f466ae9a0987a119ecb4a226a93b7bc5f57547b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 204/760] haskell-cereal: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/cereal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 4770d5216e2e..94b5033e7efa 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.4.0.0"; - sha256 = "0q6lrfa2p70mh3d08mbj89anc3p9ycy6wyyiycj5pm62kcimv7rj"; + version = "0.4.0.1"; + sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; From 11c930d02a6e1476fd93a613f0308bc9460ceec5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 205/760] haskell-language-c-quote: update to version 0.7.5 --- .../libraries/haskell/language-c-quote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 35d15c0291a6..f4774ecd14b0 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.2"; - sha256 = "01ki78qh39gbd9md3pq783vx2p86gyzhclci7pcppz2rd3man51m"; + version = "0.7.5"; + sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { buildTools = [ alex happy ]; jailbreak = true; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 57d39d5083932932c85acb31870f45b94d307d74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 206/760] haskell-tasty: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 07e4be2f0b78..556ee2b65bf9 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,13 +1,13 @@ -{ cabal, ansiTerminal, mtl, optparseApplicative, regexPosix, stm -, tagged +{ cabal, ansiTerminal, deepseq, mtl, optparseApplicative +, regexPosix, stm, tagged }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4"; - sha256 = "1gcaam49nm6fx0i2hlf1zih4rxzfgnsl4xiwnqifhz9m15n5laxq"; + version = "0.4.0.1"; + sha256 = "04nnjg04520lvjm8h2ma0ihm4bz6p0ppk445i8gmn82ixwan76h0"; buildDepends = [ - ansiTerminal mtl optparseApplicative regexPosix stm tagged + ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; meta = { description = "Modern and extensible testing framework"; From 6509447e8115132fe67a35204f963d8a42476e41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 207/760] haskell-thyme: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/thyme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 187ad078c773..da8fd1e3ec83 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.0.2"; - sha256 = "1drglcl3jv0kp51h72b8dlrr3hpsl480dv1gr4p0vnk6ynls98y6"; + version = "0.3.0.3"; + sha256 = "187q8ag6ypbvlikynanzyv8c3hskprcz6xf3p3fjraalp95p86ay"; buildDepends = [ attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace From 20b512de7c98b2a2533f0f7e8455ae8d4b467e57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:28:24 +0100 Subject: [PATCH 208/760] haskell-keter: update to version 1.0.1.2 --- pkgs/development/tools/haskell/keter/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index e6377a201fe4..c3f242bc434a 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,23 +1,23 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive , conduit, dataDefault, filepath, fsnotify, httpConduit -, httpReverseProxy, httpTypes, mtl, network, networkConduit -, networkConduitTls, random, regexTdfa, stm, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unixProcessConduit, unorderedContainers, vector, wai +, 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 }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.0.1.1"; - sha256 = "1bcp9yxmh5z7cvap4nrj8gxnndwws21w6y352yasf35bf432nxa9"; + version = "1.0.1.2"; + sha256 = "1rk0sf6riyb6r1sz0jkvwwj1yyxwjxgafpidp9rqwm8wnqyx6hh8"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async attoparsec blazeBuilder caseInsensitive conduit dataDefault filepath fsnotify httpConduit httpReverseProxy - httpTypes mtl network networkConduit networkConduitTls random - regexTdfa stm systemFileio systemFilepath tar text time + 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 ]; From 876e2278c9022aab809ca75a69b5b0faf613c8c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:46 +0100 Subject: [PATCH 209/760] haskell-bifunctors: update to version 4.1.1 --- pkgs/development/libraries/haskell/bifunctors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index d7c8fa6debb4..5d13f3a384e1 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "4.1.0.1"; - sha256 = "1mf1v64g5pr2k1jpc7i4994ki2fp5vkxg4n5v84lfbl2r3kr92yg"; + version = "4.1.1"; + sha256 = "0apdnhfqn3xyi99d5ybc51y2i0gpxix5hlaqxgpbzr4b0zkk7c4w"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; From 95fdcdb200a6f1f9883999477377b88320de4a84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:46 +0100 Subject: [PATCH 210/760] haskell-conduit: update to version 1.0.9 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index ab41f5a5621d..ffe52d0f9c77 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.8"; - sha256 = "0qsi9p7hwzaw1ridgydfmaagjjpkbgq755b1r9xm4apdy6fikcz5"; + version = "1.0.9"; + sha256 = "00xzy6iq98p0b8bqncj2xl1gzba1kr58xmfbc3s29bqg1sisvjsz"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From 598541fc157d0ecb710451a41e33c20400147179 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:46 +0100 Subject: [PATCH 211/760] haskell-html-conduit: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/html-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index eaf1754b6223..3f7b2ad507ac 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0"; - sha256 = "11mkr7plhbn8kyki0h362habzhsnlb7yrg4ypy48d0l3i7p7vm53"; + version = "1.1.0.1"; + sha256 = "0v3zlassakc34i7kzajx63s1rxn516xv7lrib0a4kn4cdlqn7kxs"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes From f4775459ac5d5f52d372d539bc1d1b115c48c651 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 212/760] haskell-threads: update to version 0.5.0.3 --- pkgs/development/libraries/haskell/threads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index d802790da9d7..0683ba62d4b0 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threads"; - version = "0.5.0.2"; - sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm"; + version = "0.5.0.3"; + sha256 = "1da5p65qf1w746flqnl7pxd05pdh8psi6psi0zsqqxmiykw4zvrf"; buildDepends = [ baseUnicodeSymbols stm ]; testDepends = [ baseUnicodeSymbols concurrentExtra HUnit stm testFramework From 59d4efda21284b0f079e9b78da32eb784f6ac6e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 213/760] haskell-yesod-bin: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index a86417f6b397..54dcf4dd19d1 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.3.4"; - sha256 = "0xwav5ghik0vzg706rcqlzk64gnvr4nn4iikx1bzymzz2p5zyg0z"; + version = "1.2.4"; + sha256 = "1n4lkhwy9kvllvfma951lwx6k731jfm4ajkpjim37k38swmmcb70"; isLibrary = false; isExecutable = true; buildDepends = [ From e3f874c0f775c4ba1b3e7d077cc9f0ca7940ed83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 214/760] haskell-yesod-core: update to version 1.2.5 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 0bd73c2ade4f..789d158fa6c5 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.4.5"; - sha256 = "091f89bwjsf2qimivbz74rykjjgzghfvs66sv9cz305pgw6kpjc7"; + version = "1.2.5"; + sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From 07fa9cec40948179233723d437a8af5aa3fdd550 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 215/760] haskell-yesod-form: update to version 1.3.4 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 5c0220f1f2aa..c26d88b50807 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.3"; - sha256 = "1maf8yczijx8rdjy4abr2jq1ds4g61jg3zbqxjzaaxsbs77gna4a"; + version = "1.3.4"; + sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From bdbda9322261177a4cb78946d45b5eca92f068ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 216/760] haskell-yesod-static: update to version 1.2.1 --- .../haskell/yesod-static/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c4aba1ddfeb2..6942cb466c50 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,24 +1,28 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohashCryptoapi, dataDefault, fileEmbed, hspec, httpTypes +, cryptohashCryptoapi, dataDefault, fileEmbed, filepath, hjsmin +, hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet , shakespeareCss, systemFileio, systemFilepath, text, transformers -, unixCompat, wai, waiAppStatic, yesodCore +, unixCompat, unorderedContainers, wai, waiAppStatic, waiTest +, yesodCore, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.0.1"; - sha256 = "1ij0j1m9j6l63rl4zdfik36a3sb3k0zpqjg85sgis6wdqr18gsi5"; + version = "1.2.1"; + sha256 = "0vsmsdyi0nx111mkyf1wkkl2i07l40gcjzrm9dbks7k4pfajxqjx"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi - dataDefault fileEmbed httpTypes shakespeareCss systemFileio - systemFilepath text transformers unixCompat wai waiAppStatic + dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes + processConduit resourcet shakespeareCss systemFileio systemFilepath + text transformers unixCompat unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi - dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio - systemFilepath text transformers unixCompat wai waiAppStatic - yesodCore + dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit + mimeTypes processConduit resourcet shakespeareCss systemFileio + systemFilepath text transformers unixCompat unorderedContainers wai + waiAppStatic waiTest yesodCore yesodTest ]; meta = { homepage = "http://www.yesodweb.com/"; From c9afccda1da79cc5c524b8ea31ff5b5c965cff97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:12:47 +0100 Subject: [PATCH 217/760] haskell-yesod: update to version 1.2.3 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 556b210b91b2..9f416ad27f93 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.2.1"; - sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4"; + version = "1.2.3"; + sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers From 4159147663f853aebc375716c5a23a20e736a734 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:38:45 +0100 Subject: [PATCH 218/760] haskell-control-monad-loop: add version 0.1 --- .../haskell/control-monad-loop/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/control-monad-loop/default.nix diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix new file mode 100644 index 000000000000..561564093b94 --- /dev/null +++ b/pkgs/development/libraries/haskell/control-monad-loop/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers, transformersBase }: + +cabal.mkDerivation (self: { + pname = "control-monad-loop"; + version = "0.1"; + sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj"; + buildDepends = [ transformers transformersBase ]; + meta = { + homepage = "https://github.com/joeyadams/haskell-control-monad-loop"; + description = "Simple monad transformer for imperative-style loops"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a8028b9a3ad5..f39600fd1c91 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -758,6 +758,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x constraints = callPackage ../development/libraries/haskell/constraints {}; + controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; + convertible = callPackage ../development/libraries/haskell/convertible {}; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; From 716318c54db62f2e9b14ff1a988e09e3c9577f24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 12:38:56 +0100 Subject: [PATCH 219/760] haskell-process-conduit: add version 1.0.0.1 --- .../haskell/process-conduit/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/process-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix new file mode 100644 index 000000000000..45ac44951667 --- /dev/null +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -0,0 +1,19 @@ +{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeareText +, text +}: + +cabal.mkDerivation (self: { + pname = "process-conduit"; + version = "1.0.0.1"; + sha256 = "1b1bya316gxj3rgn7qpjmmcllgy9aac69rqw664sw1rnypnic780"; + buildDepends = [ + conduit controlMonadLoop mtl shakespeareText text + ]; + testDepends = [ conduit hspec ]; + meta = { + homepage = "http://github.com/tanakh/process-conduit"; + description = "Conduits for processes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f39600fd1c91..d0da6ddb6844 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1733,6 +1733,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x projectTemplate = callPackage ../development/libraries/haskell/project-template {}; + processConduit = callPackage ../development/libraries/haskell/process-conduit {}; + processExtras = callPackage ../development/libraries/haskell/process-extras {}; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; From 7aefd575b5388bac12915c78c8a0f2eb0800f71e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 13:53:55 +0100 Subject: [PATCH 220/760] haskell-yesod-static: disable the yesod-static test suite It produces a strange error: Running 1 test suites... Test suite tests: RUNNING... /nix/store/gwm3821513h0jwcgxr73r3ay90shaq7r-haskell-base64-bytestring-ghc7.6.3-1.0.0.1/bin/../lib/ghc-7.6.3/package.conf.d/base64-bytestring-1.0.0.1.installedconf:1:19272: Not in scope: `main' Perhaps you meant `min' (imported from Prelude) ... I'm not sure what this means. --- pkgs/development/libraries/haskell/yesod-static/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 6942cb466c50..f9193ee971d0 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -24,6 +24,7 @@ cabal.mkDerivation (self: { systemFilepath text transformers unixCompat unorderedContainers wai waiAppStatic waiTest yesodCore yesodTest ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; From d9ed78cbd9fb0c54d18c4edc9bad61d679da7e51 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 11 Nov 2013 16:36:09 +0100 Subject: [PATCH 221/760] Add direct-sqlite haskell library --- .../libraries/haskell/direct-sqlite/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/direct-sqlite/default.nix diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix new file mode 100644 index 000000000000..7dc259cef93c --- /dev/null +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -0,0 +1,15 @@ +{ cabal, base16Bytestring, HUnit, text }: + +cabal.mkDerivation (self: { + pname = "direct-sqlite"; + version = "2.3.8"; + sha256 = "0qvqacjymrm6yy093p8biq3swdinh3lx75m27iz1p3ckdkw10lva"; + buildDepends = [ text ]; + testDepends = [ base16Bytestring HUnit text ]; + meta = { + homepage = "http://ireneknapp.com/software/"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d0da6ddb6844..22257a81f951 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -899,6 +899,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {}; + directSqlite = callPackage ../development/libraries/haskell/direct-sqlite {}; + directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; From 530a8dc7dc25f844f45c96835c451d29734cb0d5 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Mon, 11 Nov 2013 16:51:23 +0100 Subject: [PATCH 222/760] gtest: New package, the google c++ testing framework. BSD licensed testing framework from google: https://code.google.com/p/googletest/ --- pkgs/development/libraries/gtest/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/gtest/default.nix diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix new file mode 100644 index 000000000000..1e030d4d7ce0 --- /dev/null +++ b/pkgs/development/libraries/gtest/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip, cmake}: + +stdenv.mkDerivation rec { + version = "1.7.0"; + name = "gtest-${version}"; + + src = fetchurl { + url = "https://googletest.googlecode.com/files/${name}.zip"; + sha256="03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14"; + }; + + buildInputs = [ unzip cmake ]; + + configurePhase = '' + mkdir build + cd build + cmake ../ -DCMAKE_INSTALL_PREFIX=$out + ''; + + installPhase = '' + mkdir -p $out/lib + cp -v libgtest.a libgtest_main.a $out/lib + cp -v -r ../include $out + ''; + + meta = { + description = "Google test: Google's framework for writing C++ tests."; + homepage = https://code.google.com/p/googletest/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.zoomulator ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a6ef0764ac..02d585198e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1043,6 +1043,8 @@ let gt5 = callPackage ../tools/system/gt5 { }; + gtest = callPackage ../development/libraries/gtest {}; + gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; From d3435e62b2a25afd26a19591853c3e56db215321 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 1 Nov 2013 16:31:49 +0200 Subject: [PATCH 223/760] perlPackages.Switch: add missing version number --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b8b8b05c525..6fff03c8b51a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7623,7 +7623,7 @@ rec { }; Switch = buildPerlPackage rec { - name = "Switch"; + name = "Switch-2.16"; src = fetchurl { url = "mirror://cpan/authors/id/R/RG/RGARCIA/Switch-2.16.tar.gz"; sha256 = "1n7rgp1q3zwglv1pka3bnhq5g41334lwc53g31w6g44my8kqz31h"; From 6f6d611a068ba3df87dcffb16b9b5bd2cd3b5a12 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 11 Nov 2013 22:16:34 +0200 Subject: [PATCH 224/760] upower: update to 0.9.23 --- pkgs/os-specific/linux/upower/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d5dc292ac339..197a8403d323 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.19"; + name = "upower-0.9.23"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; + sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3"; }; buildInputs = @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { [ "--enable-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" ]; preConfigure = From 2192ddec0ed35f8851b865db574fe6c141343c4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 22:08:30 +0100 Subject: [PATCH 225/760] boost: say hello to version 1.55.0 --- pkgs/development/libraries/boost/1.55.nix | 91 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.55.nix diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix new file mode 100644 index 000000000000..3ae54c22be32 --- /dev/null +++ b/pkgs/development/libraries/boost/1.55.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if enablePIC && enableExceptions then + "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" + else if enablePIC then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if enableExceptions then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.55.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; + sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a6ef0764ac..c2e4081fc98c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3880,7 +3880,8 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost154 = callPackage ../development/libraries/boost/1.54.nix { }; - boost = boost154; + boost155 = callPackage ../development/libraries/boost/1.55.nix { }; + boost = boost155; boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; From d4e210539bd3897c02e69ba86f5e4badceff7cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 10 Nov 2013 20:42:44 +0100 Subject: [PATCH 226/760] alsa: bump 1.0.26 -> 1.0.27 (close #1198) Basically, bump all alsa projects to their latest version as per http://www.alsa-project.org/main/index.php/Main_Page --- pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 26d32594fba2..239c70d515d5 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.26"; + name = "alsa-lib-1.0.27.2"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "0zbfkwqn7ixa71lsna9llq6i2gic540h8r8r0rjdphrwc1hq37wc"; + sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9"; }; configureFlags = "--disable-xmlto"; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index fb17b47b5060..5b822969968c 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.0.26"; + name = "alsa-plugins-1.0.27"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2" "http://alsa.cybermirror.org/plugins/${name}.tar.bz2" ]; - sha256 = "07wz3kl6isabk15ddpzz820pqlgvw6q0m7knnbgv9780s8s52l83"; + sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b"; }; buildInputs = diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c121b227eee9..3eafe8bbfe5b 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-utils-1.0.26"; + name = "alsa-utils-1.0.27"; src = fetchurl { # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2"; - sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq"; + sha256 = "1vssljbdzf0psqhhd7w9m9mzb0sl2kgx9fagkja25sqw6ivwsxkg"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; From 85d21a696347dcef08b60ee87c60455a43560b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 11 Nov 2013 22:30:34 +0100 Subject: [PATCH 227/760] libxml2: bump 2.9.0 -> 2.9.1 (CVE-2013-1969) And drop patch that has been merged upstream. Close #1199. Hack around python install problems (the rest is from bjornfor). --- .../development/libraries/libxml2/default.nix | 25 +++++++------ .../libraries/libxml2/pthread-once-init.patch | 35 ------------------- 2 files changed, 15 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/libxml2/pthread-once-init.patch diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c2012a444394..5ead83011c8c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -2,20 +2,17 @@ assert pythonSupport -> python != null; -stdenv.mkDerivation rec { - name = "libxml2-2.9.0"; +#TODO: share most stuff between python and non-python builds, perhaps via multiple-output + +stdenv.mkDerivation (rec { + name = "libxml2-2.9.1"; src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd"; + sha256 = "1nqgd1qqmg0cg09mch78m2ac9klj9n87blilx4kymi7jcv5n8g7x"; }; - patches = [ ./pthread-once-init.patch ]; - - configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; - - buildInputs = (stdenv.lib.optional pythonSupport [ python ]) - + buildInputs = stdenv.lib.optional pythonSupport python # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -36,4 +33,12 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} + +} // stdenv.lib.optionalAttrs pythonSupport { + configureFlags = "--with-python=${python}"; + + # this is a pair of ugly hacks to make python stuff install into the right place + preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; + installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; +}) + diff --git a/pkgs/development/libraries/libxml2/pthread-once-init.patch b/pkgs/development/libraries/libxml2/pthread-once-init.patch deleted file mode 100644 index fadfc27a9118..000000000000 --- a/pkgs/development/libraries/libxml2/pthread-once-init.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://git.gnome.org/browse/libxml2/commit/?id=3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e - -From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001 -From: Friedrich Haubensak -Date: Wed, 12 Sep 2012 15:34:53 +0000 -Subject: Fix a thread portability problem - -cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10 - -I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in -a structure assignment anyway ---- -diff --git a/threads.c b/threads.c -index f206149..7e85a26 100644 ---- a/threads.c -+++ b/threads.c -@@ -146,6 +146,7 @@ struct _xmlRMutex { - static pthread_key_t globalkey; - static pthread_t mainthread; - static pthread_once_t once_control = PTHREAD_ONCE_INIT; -+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; - static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; - #elif defined HAVE_WIN32_THREADS - #if defined(HAVE_COMPILER_TLS) -@@ -915,7 +916,7 @@ xmlCleanupThreads(void) - #ifdef HAVE_PTHREAD_H - if ((libxml_is_threaded) && (pthread_key_delete != NULL)) - pthread_key_delete(globalkey); -- once_control = PTHREAD_ONCE_INIT; -+ once_control = once_control_init; - #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) - if (globalkey != TLS_OUT_OF_INDEXES) { - xmlGlobalStateCleanupHelperParams *p; --- -cgit v0.9.0.2 From 91028bd151a1fdd7773fd0bca48a314c36b40e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 12 Nov 2013 09:59:58 +0100 Subject: [PATCH 228/760] upower: fix Xfce via --enable-deprecated Also drop older libusb1 version which is no longer needed with newer upower. --- pkgs/development/libraries/libusb1/1_0_9.nix | 20 -------------------- pkgs/os-specific/linux/upower/default.nix | 20 +++++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/libraries/libusb1/1_0_9.nix diff --git a/pkgs/development/libraries/libusb1/1_0_9.nix b/pkgs/development/libraries/libusb1/1_0_9.nix deleted file mode 100644 index a2d628f96896..000000000000 --- a/pkgs/development/libraries/libusb1/1_0_9.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libusb-1.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; - }; - - buildInputs = [ pkgconfig ]; - - meta = { - homepage = http://www.libusb.org; - description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} - diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 197a8403d323..cba4a510ff06 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -19,15 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = - [ "--with-backend=linux" "--localstatedir=/var" ] - ++ stdenv.lib.optional useSystemd - [ "--enable-systemd" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd/system-sleep" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - ]; - preConfigure = '' substituteInPlace src/linux/up-backend.c \ @@ -37,6 +28,17 @@ stdenv.mkDerivation rec { --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" + "--enable-deprecated" # needed for Xfce (Nov 2013) + ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" + ]; + NIX_CFLAGS_LINK = "-lgcc_s"; installFlags = "historydir=$(TMPDIR)/foo"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 234362c13bd9..d96f0f594a6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7064,9 +7064,7 @@ let untie = callPackage ../os-specific/linux/untie { }; - upower = callPackage ../os-specific/linux/upower { - libusb1 = callPackage ../development/libraries/libusb1/1_0_9.nix {}; - }; + upower = callPackage ../os-specific/linux/upower { }; upstart = callPackage ../os-specific/linux/upstart { }; From 508e8f5347ade46829e51dbbcfc0931adf196ad7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 12 Nov 2013 11:00:15 +0100 Subject: [PATCH 229/760] nodePackages."grunt-bower-task" added --- pkgs/top-level/node-packages-generated.nix | 376 +++++++++++++-------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 243 insertions(+), 134 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 8df865009dc7..d4fbf468a5e9 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -505,7 +505,7 @@ (self.nativeDeps."aws-sdk" or []); deps = [ self.by-version."xml2js"."0.2.4" - self.by-version."xmlbuilder"."0.4.2" + self.by-version."xmlbuilder"."0.4.3" ]; peerDependencies = [ ]; @@ -513,13 +513,13 @@ }; "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc1"; by-spec."aws-sdk".">=1.2.0 <2" = - self.by-version."aws-sdk"."1.10.0"; - by-version."aws-sdk"."1.10.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.10.0"; + self.by-version."aws-sdk"."1.12.0"; + by-version."aws-sdk"."1.12.0" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-1.12.0"; src = [ - (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.10.0.tgz"; - sha1 = "a9759f3c5533c215e3747f0060fc5c2ced9ca9ce"; + (fetchurl { + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.12.0.tgz"; + sha1 = "635b42637d743b62cc795935714d955c12765eb4"; }) ]; buildInputs = @@ -802,7 +802,7 @@ self.by-version."chmodr"."0.1.0" self.by-version."fstream"."0.1.24" self.by-version."fstream-ignore"."0.0.7" - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" self.by-version."handlebars"."1.0.12" self.by-version."inquirer"."0.3.5" @@ -835,6 +835,8 @@ "bower" = self.by-version."bower"."1.2.7"; by-spec."bower".">=0.9.0" = self.by-version."bower"."1.2.7"; + by-spec."bower"."~1.2.0" = + self.by-version."bower"."1.2.7"; by-spec."bower-config"."~0.4.3" = self.by-version."bower-config"."0.4.5"; by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -1486,7 +1488,7 @@ buildInputs = (self.nativeDeps."cli" or []); deps = [ - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" ]; peerDependencies = [ ]; @@ -2150,25 +2152,25 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.1"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.3.3"; - by-version."connect-mongo"."0.3.3" = lib.makeOverridable self.buildNodePackage { - name = "connect-mongo-0.3.3"; + self.by-version."connect-mongo"."0.4.0"; + by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-mongo-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.3.3.tgz"; - sha1 = "aeaa1ca8c947599131bd90e1a024cdb789fe0100"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz"; + sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336"; }) ]; buildInputs = (self.nativeDeps."connect-mongo" or []); deps = [ - self.by-version."mongodb"."1.2.14" + self.by-version."mongodb"."1.3.19" ]; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.3.3"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.0"; by-spec."console-browserify"."0.1.x" = self.by-version."console-browserify"."0.1.6"; by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -2200,7 +2202,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.2" + self.by-version."uglify-js"."2.4.3" ]; peerDependencies = [ ]; @@ -3582,7 +3584,7 @@ (self.nativeDeps."fileset" or []); deps = [ self.by-version."minimatch"."0.2.12" - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" ]; peerDependencies = [ ]; @@ -4082,13 +4084,13 @@ passthru.names = [ "fstream-npm" ]; }; by-spec."generator-angular"."*" = - self.by-version."generator-angular"."0.5.1"; - by-version."generator-angular"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "generator-angular-0.5.1"; + self.by-version."generator-angular"."0.6.0-rc.1"; + by-version."generator-angular"."0.6.0-rc.1" = lib.makeOverridable self.buildNodePackage { + name = "generator-angular-0.6.0-rc.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.5.1.tgz"; - sha1 = "b7cd8ef2aaec9cdd4d9d792bf38ff74bb8971cc8"; + url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.6.0-rc.1.tgz"; + sha1 = "fe6852e9051934276f4c4f38325deb17db954205"; }) ]; buildInputs = @@ -4102,7 +4104,7 @@ ]; passthru.names = [ "generator-angular" ]; }; - "generator-angular" = self.by-version."generator-angular"."0.5.1"; + "generator-angular" = self.by-version."generator-angular"."0.6.0-rc.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 { @@ -4143,13 +4145,13 @@ passthru.names = [ "generator-mocha" ]; }; by-spec."generator-webapp"."*" = - self.by-version."generator-webapp"."0.4.3"; - by-version."generator-webapp"."0.4.3" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.3"; + self.by-version."generator-webapp"."0.4.4"; + by-version."generator-webapp"."0.4.4" = lib.makeOverridable self.buildNodePackage { + name = "generator-webapp-0.4.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.3.tgz"; - sha1 = "c0ad11753e0f4403d1d7fad1b298e52bfa5e231b"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.4.tgz"; + sha1 = "a7f5d7440943e3e5afbd2ad627675faf2456b74e"; }) ]; buildInputs = @@ -4164,7 +4166,7 @@ ]; passthru.names = [ "generator-webapp" ]; }; - "generator-webapp" = self.by-version."generator-webapp"."0.4.3"; + "generator-webapp" = self.by-version."generator-webapp"."0.4.4"; by-spec."getmac"."~1.0.6" = self.by-version."getmac"."1.0.6"; by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage { @@ -4223,13 +4225,13 @@ passthru.names = [ "github-url-from-username-repo" ]; }; by-spec."glob"."3" = - self.by-version."glob"."3.2.6"; - by-version."glob"."3.2.6" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.6"; + self.by-version."glob"."3.2.7"; + by-version."glob"."3.2.7" = lib.makeOverridable self.buildNodePackage { + name = "glob-3.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; - sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.7.tgz"; + sha1 = "cd75d5541dc625bd05be4f5a41c8524672533c7d"; }) ]; buildInputs = @@ -4264,9 +4266,9 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3.x" = - self.by-version."glob"."3.2.6"; + self.by-version."glob"."3.2.7"; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."3.2.6"; + self.by-version."glob"."3.2.7"; by-spec."glob"."~3.1.21" = self.by-version."glob"."3.1.21"; by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage { @@ -4289,11 +4291,11 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."~3.2.0" = - self.by-version."glob"."3.2.6"; + self.by-version."glob"."3.2.7"; by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.6"; + self.by-version."glob"."3.2.7"; by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.6"; + self.by-version."glob"."3.2.7"; by-spec."graceful-fs"."2" = self.by-version."graceful-fs"."2.0.1"; by-version."graceful-fs"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4433,14 +4435,39 @@ self.by-version."grunt"."0.4.1"; by-spec."grunt"."~0.4.1" = self.by-version."grunt"."0.4.1"; - by-spec."grunt-cli"."*" = - self.by-version."grunt-cli"."0.1.10"; - by-version."grunt-cli"."0.1.10" = lib.makeOverridable self.buildNodePackage { - name = "grunt-cli-0.1.10"; + by-spec."grunt-bower-task"."*" = + self.by-version."grunt-bower-task"."0.3.4"; + by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage { + name = "grunt-bower-task-0.3.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.10.tgz"; - sha1 = "cba4bdab74df4336f5ba7335a9f22d97a1f2dd3a"; + url = "http://registry.npmjs.org/grunt-bower-task/-/grunt-bower-task-0.3.4.tgz"; + sha1 = "6f713725ae96bb22ed60b1173cf4c522bbb8583b"; + }) + ]; + buildInputs = + (self.nativeDeps."grunt-bower-task" or []); + deps = [ + self.by-version."bower"."1.2.7" + self.by-version."lodash"."0.10.0" + self.by-version."rimraf"."2.0.3" + self.by-version."wrench"."1.4.4" + self.by-version."colors"."0.6.2" + self.by-version."async"."0.1.22" + ]; + peerDependencies = [ + ]; + passthru.names = [ "grunt-bower-task" ]; + }; + "grunt-bower-task" = self.by-version."grunt-bower-task"."0.3.4"; + by-spec."grunt-cli"."*" = + self.by-version."grunt-cli"."0.1.11"; + by-version."grunt-cli"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "grunt-cli-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.11.tgz"; + sha1 = "a0d785b7f8633983ecb5e6af8397feb6e39dd0a8"; }) ]; buildInputs = @@ -4454,9 +4481,9 @@ ]; passthru.names = [ "grunt-cli" ]; }; - "grunt-cli" = self.by-version."grunt-cli"."0.1.10"; + "grunt-cli" = self.by-version."grunt-cli"."0.1.11"; by-spec."grunt-cli"."~0.1.7" = - self.by-version."grunt-cli"."0.1.10"; + self.by-version."grunt-cli"."0.1.11"; by-spec."grunt-contrib-cssmin"."*" = self.by-version."grunt-contrib-cssmin"."0.7.0"; by-version."grunt-contrib-cssmin"."0.7.0" = lib.makeOverridable self.buildNodePackage { @@ -4544,19 +4571,19 @@ }; "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-spec."grunt-contrib-uglify"."*" = - self.by-version."grunt-contrib-uglify"."0.2.5"; - by-version."grunt-contrib-uglify"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-uglify-0.2.5"; + self.by-version."grunt-contrib-uglify"."0.2.7"; + by-version."grunt-contrib-uglify"."0.2.7" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-uglify-0.2.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.5.tgz"; - sha1 = "fd8bd7cb4ff809630ae864aaf40dea64dea5b15c"; + url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.2.7.tgz"; + sha1 = "e6bda51e0c40a1459f6cead423c65efd725a1bf7"; }) ]; buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.2" + self.by-version."uglify-js"."2.4.3" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4564,7 +4591,7 @@ ]; passthru.names = [ "grunt-contrib-uglify" ]; }; - "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.5"; + "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.2.7"; by-spec."grunt-karma"."*" = self.by-version."grunt-karma"."0.7.1"; by-version."grunt-karma"."0.7.1" = lib.makeOverridable self.buildNodePackage { @@ -5718,13 +5745,13 @@ passthru.names = [ "json-stringify-safe" ]; }; by-spec."jsontool"."*" = - self.by-version."jsontool"."6.0.0"; - by-version."jsontool"."6.0.0" = lib.makeOverridable self.buildNodePackage { - name = "jsontool-6.0.0"; + self.by-version."jsontool"."7.0.0"; + by-version."jsontool"."7.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jsontool-7.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/jsontool/-/jsontool-6.0.0.tgz"; - sha1 = "dc2a535b2aa8a10b0b7359c76fa8920cdb92ce6d"; + url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.0.tgz"; + sha1 = "eff1516e2bad7d2e251a073a415077410f434038"; }) ]; buildInputs = @@ -5735,7 +5762,7 @@ ]; passthru.names = [ "jsontool" ]; }; - "jsontool" = self.by-version."jsontool"."6.0.0"; + "jsontool" = self.by-version."jsontool"."7.0.0"; by-spec."jsprim"."0.3.0" = self.by-version."jsprim"."0.3.0"; by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -5831,13 +5858,13 @@ by-spec."karma-coffee-preprocessor"."*" = self.by-version."karma-coffee-preprocessor"."0.1.0"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.1"; - by-version."karma-coverage"."0.1.1" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.1"; + self.by-version."karma-coverage"."0.1.2"; + by-version."karma-coverage"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.1.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.1.tgz"; - sha1 = "e588d65307b8addf7b2b7589d1d1aeafdef318db"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.2.tgz"; + sha1 = "d4d11483a8242613c5949ad825d52d3e6f647041"; }) ]; buildInputs = @@ -5851,7 +5878,7 @@ ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.1"; + "karma-coverage" = self.by-version."karma-coverage"."0.1.2"; by-spec."karma-firefox-launcher"."*" = self.by-version."karma-firefox-launcher"."0.1.0"; by-spec."karma-html2js-preprocessor"."*" = @@ -6201,7 +6228,7 @@ buildInputs = (self.nativeDeps."lcov-result-merger" or []); deps = [ - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" ]; peerDependencies = [ ]; @@ -6287,6 +6314,24 @@ ]; passthru.names = [ "lockfile" ]; }; + by-spec."lodash"."~0.10.0" = + self.by-version."lodash"."0.10.0"; + by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "lodash-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-0.10.0.tgz"; + sha1 = "5254bbc2c46c827f535a27d631fd4f2bff374ce7"; + }) + ]; + buildInputs = + (self.nativeDeps."lodash" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lodash" ]; + }; by-spec."lodash"."~0.9.0" = self.by-version."lodash"."0.9.2"; by-version."lodash"."0.9.2" = lib.makeOverridable self.buildNodePackage { @@ -6936,13 +6981,13 @@ }; "mocha" = self.by-version."mocha"."1.14.0"; by-spec."mocha-unfunk-reporter"."*" = - self.by-version."mocha-unfunk-reporter"."0.3.4"; - by-version."mocha-unfunk-reporter"."0.3.4" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.3.4"; + self.by-version."mocha-unfunk-reporter"."0.3.5"; + by-version."mocha-unfunk-reporter"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.3.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.4.tgz"; - sha1 = "79c5977520677a6b8944106896b320481a4dd737"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.5.tgz"; + sha1 = "64bd69891fae638d013ac1e03806c573a27e4ff1"; }) ]; buildInputs = @@ -6955,7 +7000,7 @@ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.4"; + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.5"; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7032,10 +7077,10 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.2.x" = - self.by-version."mongodb"."1.2.14"; by-spec."mongodb"."1.3.19" = self.by-version."mongodb"."1.3.19"; + by-spec."mongodb"."1.3.x" = + self.by-version."mongodb"."1.3.19"; by-spec."mongoose"."*" = self.by-version."mongoose"."3.8.0"; by-version."mongoose"."3.8.0" = lib.makeOverridable self.buildNodePackage { @@ -7664,19 +7709,19 @@ }; "node-expat" = self.by-version."node-expat"."2.0.0"; by-spec."node-gyp"."*" = - self.by-version."node-gyp"."0.11.0"; - by-version."node-gyp"."0.11.0" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.11.0"; + self.by-version."node-gyp"."0.12.1"; + by-version."node-gyp"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.12.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.11.0.tgz"; - sha1 = "ee61d3f9a2cf4e9e2c00293d86620096e0184411"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.1.tgz"; + sha1 = "6da8a1c248b9dc73d2e14e1cd216efef3bdd7911"; }) ]; buildInputs = (self.nativeDeps."node-gyp" or []); deps = [ - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" self.by-version."graceful-fs"."2.0.1" self.by-version."fstream"."0.1.24" self.by-version."minimatch"."0.2.12" @@ -7694,9 +7739,38 @@ ]; passthru.names = [ "node-gyp" ]; }; - "node-gyp" = self.by-version."node-gyp"."0.11.0"; + "node-gyp" = self.by-version."node-gyp"."0.12.1"; by-spec."node-gyp"."~0.11.0" = self.by-version."node-gyp"."0.11.0"; + by-version."node-gyp"."0.11.0" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.11.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.11.0.tgz"; + sha1 = "ee61d3f9a2cf4e9e2c00293d86620096e0184411"; + }) + ]; + buildInputs = + (self.nativeDeps."node-gyp" or []); + deps = [ + self.by-version."glob"."3.2.7" + self.by-version."graceful-fs"."2.0.1" + self.by-version."fstream"."0.1.24" + self.by-version."minimatch"."0.2.12" + self.by-version."mkdirp"."0.3.5" + self.by-version."nopt"."2.1.2" + self.by-version."npmlog"."0.0.6" + self.by-version."osenv"."0.0.3" + self.by-version."request"."2.27.0" + self.by-version."rimraf"."2.2.2" + self.by-version."semver"."2.2.1" + self.by-version."tar"."0.1.18" + self.by-version."which"."1.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-gyp" ]; + }; by-spec."node-inspector"."*" = self.by-version."node-inspector"."0.5.0"; by-version."node-inspector"."0.5.0" = lib.makeOverridable self.buildNodePackage { @@ -7713,7 +7787,7 @@ self.by-version."socket.io"."0.9.16" self.by-version."express"."3.4.4" self.by-version."async"."0.2.9" - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" self.by-version."rc"."0.3.1" self.by-version."strong-data-uri"."0.1.0" ]; @@ -7880,7 +7954,7 @@ (self.nativeDeps."nodemailer" or []); deps = [ self.by-version."mailcomposer"."0.2.3" - self.by-version."simplesmtp"."0.3.13" + self.by-version."simplesmtp"."0.3.14" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -8012,13 +8086,13 @@ passthru.names = [ "normalize-package-data" ]; }; by-spec."npm"."*" = - self.by-version."npm"."1.3.13"; - by-version."npm"."1.3.13" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.13"; + self.by-version."npm"."1.3.14"; + by-version."npm"."1.3.14" = lib.makeOverridable self.buildNodePackage { + name = "npm-1.3.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.13.tgz"; - sha1 = "0662966d62cc92ae8875b122d4825714c781465a"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.14.tgz"; + sha1 = "9359a79309dbfef0d5443e0cd46129b9bbc88eab"; }) ]; buildInputs = @@ -8050,7 +8124,7 @@ self.by-version."npm-registry-client"."0.2.29" self.by-version."read-package-json"."1.1.4" self.by-version."read-installed"."0.2.4" - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" self.by-version."init-package-json"."0.0.11" self.by-version."osenv"."0.0.3" self.by-version."lockfile"."0.4.2" @@ -8071,9 +8145,9 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."1.3.13"; + "npm" = self.by-version."npm"."1.3.14"; by-spec."npm"."~1.3.13" = - self.by-version."npm"."1.3.13"; + self.by-version."npm"."1.3.14"; by-spec."npm-registry-client"."0.2.27" = self.by-version."npm-registry-client"."0.2.27"; by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage { @@ -9199,13 +9273,13 @@ passthru.names = [ "range-parser" ]; }; by-spec."raven"."~0.5.4" = - self.by-version."raven"."0.5.4"; - by-version."raven"."0.5.4" = lib.makeOverridable self.buildNodePackage { - name = "raven-0.5.4"; + self.by-version."raven"."0.5.6"; + by-version."raven"."0.5.6" = lib.makeOverridable self.buildNodePackage { + name = "raven-0.5.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/raven/-/raven-0.5.4.tgz"; - sha1 = "98cfd26d07dcb87d56d8236ffdb2675b9ca93754"; + url = "http://registry.npmjs.org/raven/-/raven-0.5.6.tgz"; + sha1 = "ff0704be90911694c0866893e0f8f2fb8422e063"; }) ]; buildInputs = @@ -9376,7 +9450,7 @@ buildInputs = (self.nativeDeps."read-package-json" or []); deps = [ - self.by-version."glob"."3.2.6" + self.by-version."glob"."3.2.7" self.by-version."lru-cache"."2.3.1" self.by-version."normalize-package-data"."0.2.7" self.by-version."graceful-fs"."2.0.1" @@ -10043,7 +10117,7 @@ buildInputs = (self.nativeDeps."s3http" or []); deps = [ - self.by-version."aws-sdk"."1.10.0" + self.by-version."aws-sdk"."1.12.0" self.by-version."commander"."0.5.1" self.by-version."http-auth"."1.2.7" ]; @@ -10342,13 +10416,13 @@ by-spec."shelljs"."~0.1.4" = self.by-version."shelljs"."0.1.4"; by-spec."should"."*" = - self.by-version."should"."2.0.2"; - by-version."should"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "should-2.0.2"; + self.by-version."should"."2.1.0"; + by-version."should"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "should-2.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-2.0.2.tgz"; - sha1 = "df48464e0804aa5db723277bb30a998ebc8a0857"; + url = "http://registry.npmjs.org/should/-/should-2.1.0.tgz"; + sha1 = "6bffa59a47892206fed91fe0f2b7217bda61e9ca"; }) ]; buildInputs = @@ -10359,7 +10433,7 @@ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."2.0.2"; + "should" = self.by-version."should"."2.1.0"; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -10401,13 +10475,13 @@ by-spec."signals"."~1.0.0" = self.by-version."signals"."1.0.0"; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.13"; - by-version."simplesmtp"."0.3.13" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.13"; + self.by-version."simplesmtp"."0.3.14"; + by-version."simplesmtp"."0.3.14" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.13.tgz"; - sha1 = "87d5280f04f4a0003674daf399b442e807bd7eee"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.14.tgz"; + sha1 = "48feabc1a87113adb1a2508a000ed50d19d229dc"; }) ]; buildInputs = @@ -10778,13 +10852,13 @@ passthru.names = [ "ssh-agent" ]; }; by-spec."ssh2"."~0.2.12" = - self.by-version."ssh2"."0.2.12"; - by-version."ssh2"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "ssh2-0.2.12"; + self.by-version."ssh2"."0.2.13"; + by-version."ssh2"."0.2.13" = lib.makeOverridable self.buildNodePackage { + name = "ssh2-0.2.13"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.12.tgz"; - sha1 = "38ba81c58d6a3e9af1b27548f1819266b3a39c4a"; + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.13.tgz"; + sha1 = "b4596d26b60651d4b764a40043c7781a2fbbf6a1"; }) ]; buildInputs = @@ -11558,13 +11632,13 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.2"; - by-version."uglify-js"."2.4.2" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.2"; + self.by-version."uglify-js"."2.4.3"; + by-version."uglify-js"."2.4.3" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.2.tgz"; - sha1 = "9301b81a179b7f82be0118f0768d8df01a8afe89"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.3.tgz"; + sha1 = "6883cd4b837a4d004191c9ea05394cfa596c3748"; }) ]; buildInputs = @@ -11756,13 +11830,13 @@ self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.4.0" self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.12" + self.by-version."ssh2"."0.2.13" self.by-version."rc"."0.3.1" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" self.by-version."passport"."0.1.17" self.by-version."passport-local"."0.1.6" - self.by-version."npm"."1.3.13" + self.by-version."npm"."1.3.14" self.by-version."semver"."2.2.1" self.by-version."forever-monitor"."1.1.0" self.by-version."open"."0.0.4" @@ -11775,7 +11849,7 @@ self.by-version."keen.io"."0.0.3" self.by-version."getmac"."1.0.6" self.by-version."deep-extend"."0.2.6" - self.by-version."raven"."0.5.4" + self.by-version."raven"."0.5.6" ]; peerDependencies = [ ]; @@ -12171,13 +12245,13 @@ passthru.names = [ "wd" ]; }; by-spec."webdrvr"."*" = - self.by-version."webdrvr"."2.37.0-0"; - by-version."webdrvr"."2.37.0-0" = lib.makeOverridable self.buildNodePackage { - name = "webdrvr-2.37.0-0"; + self.by-version."webdrvr"."2.37.0-1"; + by-version."webdrvr"."2.37.0-1" = lib.makeOverridable self.buildNodePackage { + name = "webdrvr-2.37.0-1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-0.tgz"; - sha1 = "fc939fd7faa364d790bbb20760227346236df07e"; + url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.37.0-1.tgz"; + sha1 = "8f1f2fbcc184b8964d26f0fca73264e0c1d595ea"; }) ]; buildInputs = @@ -12195,7 +12269,7 @@ ]; passthru.names = [ "webdrvr" ]; }; - "webdrvr" = self.by-version."webdrvr"."2.37.0-0"; + "webdrvr" = self.by-version."webdrvr"."2.37.0-1"; by-spec."websocket-driver".">=0.3.0" = self.by-version."websocket-driver"."0.3.0"; by-version."websocket-driver"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12395,6 +12469,24 @@ self.by-version."wordwrap"."0.0.2"; by-spec."wordwrap"."~0.0.2" = self.by-version."wordwrap"."0.0.2"; + by-spec."wrench"."~1.4.3" = + self.by-version."wrench"."1.4.4"; + by-version."wrench"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "wrench-1.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wrench/-/wrench-1.4.4.tgz"; + sha1 = "7f523efdb71b0100e77dce834c06523cbe3d54e0"; + }) + ]; + buildInputs = + (self.nativeDeps."wrench" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "wrench" ]; + }; by-spec."ws"."0.4.x" = self.by-version."ws"."0.4.31"; by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage { @@ -12496,6 +12588,24 @@ by-spec."xml2js".">= 0.0.1" = self.by-version."xml2js"."0.2.8"; by-spec."xmlbuilder"."*" = + self.by-version."xmlbuilder"."0.4.3"; + by-version."xmlbuilder"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "xmlbuilder-0.4.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; + sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + }) + ]; + buildInputs = + (self.nativeDeps."xmlbuilder" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "xmlbuilder" ]; + }; + by-spec."xmlbuilder"."0.4.2" = self.by-version."xmlbuilder"."0.4.2"; by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage { name = "xmlbuilder-0.4.2"; @@ -12513,8 +12623,6 @@ ]; passthru.names = [ "xmlbuilder" ]; }; - by-spec."xmlbuilder"."0.4.2" = - self.by-version."xmlbuilder"."0.4.2"; by-spec."xmlhttprequest"."1.4.2" = self.by-version."xmlhttprequest"."1.4.2"; by-version."xmlhttprequest"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -12624,7 +12732,7 @@ 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.6" + self.by-version."glob"."3.2.7" self.by-version."debug"."0.7.3" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" @@ -12668,7 +12776,7 @@ self.by-version."chalk"."0.2.1" ]; peerDependencies = [ - self.by-version."grunt-cli"."0.1.10" + self.by-version."grunt-cli"."0.1.11" self.by-version."bower"."1.2.7" ]; passthru.names = [ "yo" ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 1057e3f6f287..d3ac89f96866 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -84,6 +84,7 @@ , "grunt-contrib-cssmin" , "grunt-contrib-uglify" , "grunt-karma" +, "grunt-bower-task" , "grunt-sed" , "karma" , "karma-mocha" From f685b08d0d99be4310df2a500f9128d8905810d4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 12 Nov 2013 11:00:58 +0100 Subject: [PATCH 230/760] emacs offlineimap mode added --- .../emacs-modes/offlineimap/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/offlineimap/default.nix diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix new file mode 100644 index 000000000000..d94da4f88d9e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + rev = "646482203aacdf847d57d0a96263fddcfc33fb61"; + name = "emacs-offlineimap-${rev}"; + + src = fetchgit { + inherit rev; + url = "git://git.naquadah.org/offlineimap-el.git"; + sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"; + }; + + buildInputs = [ emacs ]; + + installPhase = '' + substituteInPlace offlineimap.el --replace "Machine.MachineUI" "machineui" + emacs --batch -f batch-byte-compile offlineimap.el + install -d $out/share/emacs/site-lisp + install offlineimap.el offlineimap.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "OfflineIMAP support for Emacs"; + homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d96f0f594a6c..3c6368125e78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7705,6 +7705,8 @@ let notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); + offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; + # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; }); From 39e9fabae0fe5476ad682a52dba42b2c6dbe1a57 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 12 Nov 2013 14:43:29 +0200 Subject: [PATCH 231/760] ZNC modules: expose meta properly, fix typo in license --- pkgs/applications/networking/znc/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ba6d36a3c76c..478900bae4c9 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -10,7 +10,7 @@ let inherit buildPhase; inherit installPhase; - meta.platforms = stdenv.lib.platforms.unix; + meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; passthru.module_name = module_name; }); @@ -30,7 +30,7 @@ in rec { description = "Push notification service module for ZNC"; homepage = https://github.com/jreese/znc-push; repositories.git = https://github.com/jreese/znc-push.git; - license = stdenv.lib.license.mit; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.offline ]; }; }; From 785eaf2cea3c57daef96bb209f44589e3f48a7ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Nov 2013 13:48:19 +0100 Subject: [PATCH 232/760] Add some primops to lib --- lib/attrsets.nix | 4 +- lib/default.nix | 2 - lib/lists.nix | 37 +++++++++++-------- lib/modules.nix | 6 +-- lib/options.nix | 10 ++--- lib/strings.nix | 3 +- lib/trivial.nix | 10 ++++- lib/types.nix | 14 +++---- nixos/modules/config/shells-environment.nix | 4 +- nixos/modules/config/sysctl.nix | 2 +- nixos/modules/hardware/network/b43.nix | 18 +++++---- nixos/modules/installer/cd-dvd/channel.nix | 2 +- nixos/modules/services/misc/disnix.nix | 4 +- .../modules/services/networking/ssh/sshd.nix | 4 +- .../modules/services/torrent/transmission.nix | 2 +- .../web-servers/apache-httpd/default.nix | 4 +- .../system/activation/activation-script.nix | 2 +- 17 files changed, 70 insertions(+), 58 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 7c93d8698de0..f314c02ff32b 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,7 +1,7 @@ # Operations on attribute sets. with { - inherit (builtins) head tail isString; + inherit (builtins) head tail; inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; @@ -100,7 +100,7 @@ rec { (AttrSet -> Bool) -> AttrSet -> AttrSet Example: - collect builtins.isList { a = { b = ["b"]; }; c = [1]; } + collect isList { a = { b = ["b"]; }; c = [1]; } => [["b"] [1]] collect (x: x ? outPath) diff --git a/lib/default.nix b/lib/default.nix index fc92e04503b2..4b6027c437be 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,8 +21,6 @@ let in { inherit trivial lists strings stringsWithDeps attrsets sources options modules types meta debug maintainers licenses platforms systems; - # Pull in some builtins not included elsewhere. - inherit (builtins) pathExists readFile; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. diff --git a/lib/lists.nix b/lib/lists.nix index d0b09539bf69..2a1fa7205637 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,14 +1,16 @@ # General list operations. -let - inherit (import ./trivial.nix) deepSeq; +with import ./trivial.nix; + +let inc = builtins.add 1; dec = n: builtins.sub n 1; in rec { - inherit (builtins) head tail length isList add sub lessThan elemAt; + + inherit (builtins) head tail length isList elemAt; # Create a list consisting of a single element. `singleton x' is @@ -55,7 +57,7 @@ in rec { else [ (f (inc n) (elemAt list n)) ] ++ imap' (inc n); in imap' 0; - + # Concatenate a list of lists. concatLists = builtins.concatLists or (fold (x: y: x ++ y) []); @@ -72,7 +74,7 @@ in rec { then fold (x: y: (flatten x) ++ y) [] x else [x]; - + # Filter a list using a predicate; that is, return a list containing # every element from `list' for which `pred' returns true. filter = @@ -80,11 +82,11 @@ in rec { (pred: list: fold (x: y: if pred x then [x] ++ y else y) [] list); - + # Remove elements equal to 'e' from a list. Useful for buildInputs. remove = e: filter (x: x != e); - + # Return true if `list' has an element `x'. elem = builtins.elem or @@ -106,7 +108,7 @@ in rec { findFirst = pred: default: list: let found = filter pred list; in if found == [] then default else head found; - + # Return true iff function `pred' returns true for at least element # of `list'. @@ -136,16 +138,16 @@ in rec { # If argument is a list, return it; else, wrap it in a singleton # list. If you're using this, you should almost certainly # reconsider if there isn't a more "well-typed" approach. - toList = x: if builtins.isList x then x else [x]; + toList = x: if isList x then x else [x]; + - # Return a list of integers from `first' up to and including `last'. range = first: last: - if builtins.lessThan last first + if lessThan last first then [] - else [first] ++ range (builtins.add first 1) last; + else [first] ++ range (add first 1) last; + - # Partition the elements of a list in two lists, `right' and # `wrong', depending on the evaluation of a predicate. partition = pred: @@ -160,7 +162,7 @@ in rec { let len1 = length fst; len2 = length snd; - len = if builtins.lessThan len1 len2 then len1 else len2; + len = if lessThan len1 len2 then len1 else len2; zipListsWith' = n: if n != len then [ (f (elemAt fst n) (elemAt snd n)) ] @@ -207,7 +209,7 @@ in rec { [ (elemAt list n) ] ++ take' (inc n); in take' 0; - + # Remove the first (at most) N elements of a list. drop = count: list: let @@ -219,7 +221,8 @@ in rec { drop' (dec n) ++ [ (elemAt list n) ]; in drop' (dec len); - + + # Return the last element of a list. last = list: assert list != []; elemAt list (dec (length list)); @@ -237,5 +240,7 @@ in rec { else []; in zipTwoLists' 0; + deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; + } diff --git a/lib/modules.nix b/lib/modules.nix index 071809daa58e..fa31ce6399ce 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -42,7 +42,7 @@ rec { closeModules = modules: args: let toClosureList = file: parentKey: imap (n: x: - if isAttrs x || builtins.isFunction x then + if isAttrs x || isFunction x then unifyModuleSyntax file "${parentKey}:anon-${toString n}" (applyIfFunction x args) else unifyModuleSyntax (toString x) (toString x) (applyIfFunction (import x) args)); @@ -74,7 +74,7 @@ rec { config = removeAttrs m ["key" "_file" "require" "imports"]; }; - applyIfFunction = f: arg: if builtins.isFunction f then f arg else f; + applyIfFunction = f: arg: if isFunction f then f arg else f; /* Merge a list of modules. This will recurse over the option declarations in all modules, combining them into a single set. @@ -260,7 +260,7 @@ rec { options' = opt.options or (throw "Option `${showOption loc'}' has type optionSet but has no option attribute."); coerce = x: - if builtins.isFunction x then x + if isFunction x then x else { config, ... }: { options = x; }; options = map coerce (flatten options'); f = tp: diff --git a/lib/options.nix b/lib/options.nix index 63798c4faa3b..71e02db58f69 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -34,12 +34,12 @@ rec { mergeDefaultOption = loc: defs: let list = getValues defs; in if length list == 1 then head list - else if all builtins.isFunction list then x: mergeDefaultOption loc (map (f: f x) list) + else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list) else if all isList list then concatLists list else if all isAttrs list then fold lib.mergeAttrs {} list - else if all builtins.isBool list then fold lib.or false list - else if all builtins.isString list then lib.concatStrings list - else if all builtins.isInt list && all (x: x == head list) list then head list + else if all isBool list then fold lib.or false list + else if all isString list then lib.concatStrings list + else if all isInt list && all (x: x == head list) list then head list else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; /* Obsolete, will remove soon. Specify an option type or apply @@ -54,7 +54,7 @@ rec { mergeListOption = mergeTypedOption "list" isList concatLists; - mergeStringOption = mergeTypedOption "string" builtins.isString lib.concatStrings; + mergeStringOption = mergeTypedOption "string" isString lib.concatStrings; mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." diff --git a/lib/strings.nix b/lib/strings.nix index 024a9ac7d7a2..cd748f02cc63 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -7,7 +7,8 @@ inherit (builtins) add sub lessThan length; in rec { - inherit (builtins) stringLength substring head tail; + + inherit (builtins) stringLength substring head tail isString; # Concatenate a list of strings. diff --git a/lib/trivial.nix b/lib/trivial.nix index 8af3474f2a67..760a74ce6664 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -16,7 +16,7 @@ rec { or = x: y: x || y; and = x: y: x && y; mergeAttrs = x: y: x // y; - + # Take a function and evaluate it with its own returned value. fix = f: let result = f result; in result; @@ -26,7 +26,7 @@ rec { # `seq x y' evaluates x, then returns y. That is, it forces strict # evaluation of its first argument. seq = x: y: if x == null then y else y; - + # Like `seq', but recurses into lists and attribute sets to force evaluation # of all list elements/attributes. deepSeq = x: y: @@ -35,4 +35,10 @@ rec { else if builtins.isAttrs x then deepSeqAttrs x y else seq x y; + + # Pull in some builtins not included elsewhere. + inherit (builtins) + pathExists readFile isBool isFunction + isInt add sub lessThan; + } diff --git a/lib/types.nix b/lib/types.nix index 09b29a762e1d..bdd21f123952 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -48,19 +48,19 @@ rec { bool = mkOptionType { name = "boolean"; - check = builtins.isBool; + check = isBool; merge = loc: fold (x: y: x.value || y) false; }; int = mkOptionType { name = "integer"; - check = builtins.isInt; + check = isInt; merge = mergeOneOption; }; str = mkOptionType { name = "string"; - check = builtins.isString; + check = isString; merge = mergeOneOption; }; @@ -68,7 +68,7 @@ rec { # separator between the values). separatedString = sep: mkOptionType { name = "string"; - check = builtins.isString; + check = isString; merge = loc: defs: concatStringsSep sep (getValues defs); }; @@ -170,7 +170,7 @@ rec { functionTo = elemType: mkOptionType { name = "function that evaluates to a(n) ${elemType.name}"; - check = builtins.isFunction; + check = isFunction; merge = loc: defs: fnArgs: elemType.merge loc (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs); getSubOptions = elemType.getSubOptions; @@ -183,10 +183,10 @@ rec { in mkOptionType rec { name = "submodule"; - check = x: isAttrs x || builtins.isFunction x; + check = x: isAttrs x || isFunction x; merge = loc: defs: let - coerce = def: if builtins.isFunction def then def else { config = def; }; + coerce = def: if isFunction def then def else { config = def; }; modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs; in (evalModules { inherit modules; args.name = last loc; prefix = loc; }).config; getSubOptions = prefix: (evalModules diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index e3fbdd7aaec1..0b4f75a35216 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -31,9 +31,9 @@ in res = (head defs').value; in if isList res then concatLists (getValues defs') - else if builtins.lessThan 1 (length defs') then + else if lessThan 1 (length defs') then throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." - else if !builtins.isString res then + else if !isString res then throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." else res; }); diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 31441bad6157..f987c9c9e944 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -6,7 +6,7 @@ let sysctlOption = mkOptionType { name = "sysctl option value"; - check = x: builtins.isBool x || builtins.isString x || builtins.isInt x; + check = x: isBool x || isString x || isInt x; merge = args: defs: (last defs).value; # FIXME: hacky way to allow overriding in configuration.nix. }; diff --git a/nixos/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix index 8f45bd4d3f1a..03f81f92ef0b 100644 --- a/nixos/modules/hardware/network/b43.nix +++ b/nixos/modules/hardware/network/b43.nix @@ -1,4 +1,6 @@ -{pkgs, config, ...}: +{ config, pkgs, ... }: + +with pkgs.lib; let kernelVersion = config.boot.kernelPackages.kernel.version; in @@ -8,9 +10,9 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in options = { - networking.enableB43Firmware = pkgs.lib.mkOption { + networking.enableB43Firmware = mkOption { default = false; - type = pkgs.lib.types.bool; + type = types.bool; description = '' Turn on this option if you want firmware for the NICs supported by the b43 module. ''; @@ -21,11 +23,11 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in ###### implementation - config = pkgs.lib.mkIf config.networking.enableB43Firmware { - assertions = [ { - assertion = builtins.lessThan 0 (builtins.compareVersions kernelVersion "3.2"); - message = "b43 firmware for kernels older than 3.2 not packaged yet!"; - } ]; + config = mkIf config.networking.enableB43Firmware { + assertions = singleton + { assertion = lessThan 0 (builtins.compareVersions kernelVersion "3.2"); + message = "b43 firmware for kernels older than 3.2 not packaged yet!"; + }; hardware.firmware = [ pkgs.b43Firmware_5_1_138 ]; }; diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index bcf3dbb3f735..9aca5b89d258 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -11,7 +11,7 @@ let # CD. These are installed into the "nixos" channel of the root # user, as expected by nixos-rebuild/nixos-install. channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" - { expr = builtins.readFile ../../../lib/channel-expr.nix; } + { expr = readFile ../../../lib/channel-expr.nix; } '' mkdir -p $out/nixos cp -prd ${pkgs.path} $out/nixos/nixpkgs diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 72b98d1f84a5..82526b154e7a 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -111,7 +111,7 @@ in // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; } // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) ( - optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) + optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = readFile config.services.mysql.rootPassword; }) ) ; @@ -152,7 +152,7 @@ in ${concatMapStrings (infrastructureAttrName: let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure); in - if builtins.isInt infrastructureAttrValue then + if isInt infrastructureAttrValue then ''${infrastructureAttrName}=${toString infrastructureAttrValue} \ '' else diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 7a2335847e3a..85b6ab1efecf 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -19,7 +19,7 @@ let knownHostsFile = pkgs.writeText "ssh_known_hosts" ( flip concatMapStrings knownHosts (h: - "${concatStringsSep "," h.hostNames} ${builtins.readFile h.publicKeyFile}" + "${concatStringsSep "," h.hostNames} ${readFile h.publicKeyFile}" ) ); @@ -59,7 +59,7 @@ let mode = "0444"; source = pkgs.writeText "${u.name}-authorized_keys" '' ${concatStringsSep "\n" u.openssh.authorizedKeys.keys} - ${concatMapStrings (f: builtins.readFile f + "\n") u.openssh.authorizedKeys.keyFiles} + ${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 063332d48628..68f9b0647c0e 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -15,7 +15,7 @@ let toOption = x: if x == true then "true" else if x == false then "false" - else if builtins.isInt x then toString x + else if isInt x then toString x else toString ''\"${x}\"''; # All lines in settings.json end with a ',' (comma), except for the last diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index d21b6da0e772..900948893489 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -17,8 +17,8 @@ let getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80; extraModules = attrByPath ["extraModules"] [] mainCfg; - extraForeignModules = filter builtins.isAttrs extraModules; - extraApacheModules = filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet + extraForeignModules = filter isAttrs extraModules; + extraApacheModules = filter isString extraModules; makeServerInfo = cfg: { diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index e012c977164e..1545bcb8a1f9 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -71,7 +71,7 @@ in ${ let - set' = mapAttrs (n: v: if builtins.isString v then noDepEntry v else v) set; + set' = mapAttrs (n: v: if isString v then noDepEntry v else v) set; withHeadlines = addAttributeName set'; in textClosureMap id (withHeadlines) (attrNames withHeadlines) } From a8b693fef7bd44695a3891deb386a4d09ae8ae1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Nov 2013 13:50:45 +0100 Subject: [PATCH 233/760] Remove backward-compatible implementations of some primops Nixpkgs requires at least Nix 1.2 anyway, so these are now useless. --- lib/attrsets.nix | 4 ++-- lib/lists.nix | 20 +------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index f314c02ff32b..da735d71b255 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -20,7 +20,7 @@ rec { let attr = head attrPath; in if attrPath == [] then e - else if builtins ? hasAttr && hasAttr attr e + else if hasAttr attr e then attrByPath (tail attrPath) default (getAttr attr e) else default; @@ -110,7 +110,7 @@ rec { collect = pred: attrs: if pred attrs then [ attrs ] - else if builtins.isAttrs attrs then + else if isAttrs attrs then concatMap (collect pred) (attrValues attrs) else []; diff --git a/lib/lists.nix b/lib/lists.nix index 2a1fa7205637..d6e8628f03a1 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -10,7 +10,7 @@ let in rec { - inherit (builtins) head tail length isList elemAt; + inherit (builtins) head tail length isList elemAt concatLists filter elem; # Create a list consisting of a single element. `singleton x' is @@ -58,10 +58,6 @@ in rec { in imap' 0; - # Concatenate a list of lists. - concatLists = builtins.concatLists or (fold (x: y: x ++ y) []); - - # Map and concatenate the result. concatMap = f: list: concatLists (map f list); @@ -75,24 +71,10 @@ in rec { else [x]; - # Filter a list using a predicate; that is, return a list containing - # every element from `list' for which `pred' returns true. - filter = - builtins.filter or - (pred: list: - fold (x: y: if pred x then [x] ++ y else y) [] list); - - # Remove elements equal to 'e' from a list. Useful for buildInputs. remove = e: filter (x: x != e); - # Return true if `list' has an element `x'. - elem = - builtins.elem or - (x: list: fold (a: bs: x == a || bs) false list); - - # Find the sole element in the list matching the specified # predicate, returns `default' if no such element exists, or # `multiple' if there are multiple matching elements. From 9220d5b002d0b3fce8e23ab8de63caa8649d80f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 12 Nov 2013 14:05:54 +0100 Subject: [PATCH 234/760] libxml2 on FreeBSD: disable impure python detection This might be good for all platforms, when we do some big rebuild again. --- pkgs/development/libraries/libxml2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 5ead83011c8c..b86df4969c29 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -40,5 +40,8 @@ stdenv.mkDerivation (rec { # this is a pair of ugly hacks to make python stuff install into the right place preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; + +} // stdenv.lib.optionalAttrs (!pythonSupport && stdenv.isFreeBSD) { + configureFlags = "--with-python=no"; # otherwise build impurity bites us }) From 86038eaa1d46394fb7b596468bd9d5064582dd8b Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 12 Nov 2013 15:44:20 +0400 Subject: [PATCH 235/760] xfce: remove icon caches (close #1207) vcunat deleted another one --- pkgs/desktops/xfce/core/libxfce4ui.nix | 2 ++ pkgs/desktops/xfce/core/thunar-archive-plugin.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 4f0e7062e459..5675c09fed81 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libstartup_notification ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix index 62b04caaa347..4776af3be324 100644 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ]; enableParallelBuilding = true; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + meta = { homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; From 4cada34b7f85b95c5e1c071ed629b7e6876a8a9a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Nov 2013 16:58:36 +0100 Subject: [PATCH 236/760] Properly handle unit names with dashes in them We ended up with files in /etc/systemd/system called "bigx2ddata.mount.wants" rather than "big\x2ddata.mount.wants". --- nixos/modules/system/boot/systemd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index c1fb2c45165c..7c6807340fd3 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -348,14 +348,14 @@ let ${concatStrings (mapAttrsToList (name: unit: concatMapStrings (name2: '' - mkdir -p $out/${name2}.wants - ln -sfn ../${name} $out/${name2}.wants/ + mkdir -p $out/'${name2}.wants' + ln -sfn '../${name}' $out/'${name2}.wants'/ '') unit.wantedBy) cfg.units)} ${concatStrings (mapAttrsToList (name: unit: concatMapStrings (name2: '' - mkdir -p $out/${name2}.requires - ln -sfn ../${name} $out/${name2}.requires/ + mkdir -p $out/'${name2}.requires' + ln -sfn '../${name}' $out/'${name2}.requires'/ '') unit.requiredBy) cfg.units)} ln -s ${cfg.defaultUnit} $out/default.target From d207047afc29c86bc606372b45959b47f9decb7f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Nov 2013 17:56:14 +0100 Subject: [PATCH 237/760] sudo: Update to 1.8.8 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e361746c57b9..568b39be87d5 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { - name = "sudo-1.8.6p7"; + name = "sudo-1.8.8"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0djh2b14d1b1knah46v971x940rz63hvnskz16fzami3nbnqj41h"; + sha256 = "1j9gk6pfqry44gvp41p7ajfnpl58jw8shbxmvq381ywpj8g1r4cz"; }; postConfigure = '' From 6937e0a99b92ea14e7dca83ea5fc80b346b495f4 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 12 Nov 2013 13:32:42 +0100 Subject: [PATCH 238/760] yaws: Update to 1.98. This fixes the build when compiled with Erlang 16B01 (default). Signed-off-by: Moritz Ulrich --- pkgs/servers/http/yaws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 7828cf843982..933df2d0e360 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yaws-${version}"; - version = "1.95"; + version = "1.98"; src = fetchurl { url = "http://yaws.hyber.org/download/${name}.tar.gz"; - sha256 = "01jlp6v8l95n9k5rbp4kvklnh95q7yv9lp2a6ahyixb1cn1sxvz4"; + sha256 = "0c88da7gxha7an3c82j5a3r1y0j7cjq66zqfrzjihg8pwp618zfl"; }; # The tarball includes a symlink yaws -> yaws-1.95, which seems to be @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://http://yaws.hyber.org; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu the-kenny ]; }; } From 96552b683e6f15e380eff34a71bc081bbd9104a4 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 12 Nov 2013 20:06:46 +0100 Subject: [PATCH 239/760] Erlang: Update to R16B02. Signed-off-by: Moritz Ulrich --- .../interpreters/erlang/{R16B01.nix => default.nix} | 9 ++++----- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) rename pkgs/development/interpreters/erlang/{R16B01.nix => default.nix} (89%) diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/default.nix similarity index 89% rename from pkgs/development/interpreters/erlang/R16B01.nix rename to pkgs/development/interpreters/erlang/default.nix index 168db4484b10..9562a0dc4522 100644 --- a/pkgs/development/interpreters/erlang/R16B01.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -4,14 +4,13 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; -let version = "16B01"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "erlang-" + version; + version = "R16B02"; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R16B01.tar.gz"; - sha256 = "1h5b2mil79z307mc7ammi38qnd8f50n3sv5vyl4d1gcfgg08nf6s"; + url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; + sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c6368125e78..e5241ff7d43f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3136,8 +3136,7 @@ let erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { }; - erlang = erlangR16B01; + erlang = callPackage ../development/interpreters/erlang/default.nix { }; rebar = callPackage ../development/tools/build-managers/rebar { }; From 6c2ee56e4bf76ee3f73b15b108eb35a841d875d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 12 Nov 2013 20:06:58 +0100 Subject: [PATCH 240/760] samba: bump 3.6.18 -> 3.6.20 (security fixes) 3.6.20 is a security release in order to address CVE-2013-4475 (ACLs are not checked on opening an alternate data stream on a file or directory) and CVE-2013-4476 (Private key in key.pem world readable). And 3.6.19 had some bug fixes: http://www.samba.org/samba/history/samba-3.6.19.html --- pkgs/servers/samba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 568daf36773f..5ef4ac5140ee 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.18"; + name = "samba-3.6.20"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "14lrb7724952wyc1sah4nsngd6cv8x8y96cm7f3awzjnfyxajwbd"; + sha256 = "03rs02743slfbfws9rl053z5m520rbd31z9qr76r1j06bjkdmdaz"; }; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] From a5bc30698554a01814a2db4f52f3d4075a0a9632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 11 Nov 2013 22:22:17 +0100 Subject: [PATCH 241/760] Adding revisions to all fetch* of ngrok. --- pkgs/tools/misc/ngrok/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index 971c42aac71c..e517dba7c550 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -3,36 +3,43 @@ let go-websocket = fetchgit { url = "git://github.com/garyburd/go-websocket"; - rev = "refs/heads/master"; - sha256 = "1e4fcff29c961cd7433ba1b655412d466edfeb1f0829b41f578764857bc801fe"; + rev = "4bad98c955"; + sha256 = "1zh1r1xqar47awgv8a883zmxyvj65m0mbdm17d1xf74nkkrcykqy"; }; go-metrics = fetchgit { url = "https://github.com/inconshreveable/go-metrics"; + rev = "60ba4ca70c"; sha256 = "3dc8c229ce5123d86269c0c48401a9cdd2cde7558d85374c9dbc4bbd531e86d5"; }; termbox-go = fetchgit { url = "https://github.com/nsf/termbox-go"; - sha256 = "6b23e8eabb1c7a99dc8c5a7dd5ecb2c2ae736c7f54e485548d08ac337b3a0400"; + rev = "cea198fce7"; + sha256 = "bde4190ae83d5c5870b8e11e16387cf03f2d44a8369f94674d4b9d0960c40693"; }; go-bindata = fetchgit { url = "https://github.com/inconshreveable/go-bindata"; + rev = "99016b3cc0"; sha256 = "518a5b61cfbe58f8bc55bd6139adcd69997b6ba474536a70b538879aaf118578"; }; go-update = fetchgit { url = "https://github.com/inconshreveable/go-update"; + rev = "3f04666667"; sha256 = "34647689a50b9d12e85a280d9034cc1772079163481c4778ee4b3e6c4b41e2f4"; }; goyaml = fetchbzr { url = "https://launchpad.net/goyaml"; sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj"; - revision = "branch:lp:goyaml"; + # Branch: "branch:lp:goyaml" + revision = 47; }; log4go = fetchhg { url = "https://code.google.com/p/log4go/"; + tag = "c3294304d93f"; sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; }; osext = fetchhg { url = "https://bitbucket.org/kardianos/osext"; + tag = "364fb57"; sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws"; }; in stdenv.mkDerivation rec { From 844b053cce172c9cd4cc60b640c83490aea7c47b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 12 Nov 2013 21:53:37 +0100 Subject: [PATCH 242/760] ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors ghostscript and freetype were enabled but the configure script couldn't find them. It turns out it uses pkgconfig to search for them. Signed-off-by: Moritz Ulrich --- .../applications/graphics/ImageMagick/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c2a661c82fdf..0a6aed814ae5 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl +, pkgconfig , bzip2 +, fontconfig , freetype , ghostscript ? null , libjpeg @@ -16,14 +18,14 @@ }: let - version = "6.8.6-9"; + version = "6.8.7-5"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; + sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; }; enableParallelBuilding = true; @@ -42,17 +44,18 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = - [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg + [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; - buildInputs = [ tetex ]; + buildInputs = [ tetex pkgconfig ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; - meta = { + meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ the-kenny ]; }; } From 868fa84e3a1425be744fb757ae7fc62ac506e3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 12 Nov 2013 22:11:47 +0100 Subject: [PATCH 243/760] Adding smartdeblur (gpl3 version, ~1.27) --- .../graphics/smartdeblur/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/graphics/smartdeblur/default.nix diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix new file mode 100644 index 000000000000..83f3c7510298 --- /dev/null +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, cmake, qt4, fftw }: + +let + rev = "9895036d26"; +in +stdenv.mkDerivation rec { + name = "smartdeblur-git-${rev}"; + + src = fetchurl { + url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}"; + name = "${name}.tar.gz"; + sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + }; + + preConfigure = '' + cd src + ''; + + enableParallelBuilding = true; + + buildInputs = [ cmake qt4 fftw ]; + + cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; + + meta = { + homepage = "https://github.com/Y-Vladimir/SmartDeblur"; + description = "Tool for restoring blurry and defocused images"; + license = "GPLv3"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5241ff7d43f..6d86b360b89c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8693,6 +8693,10 @@ let libpng = libpng12; }; + smartdeblur = callPackage ../applications/graphics/smartdeblur { + fftw = fftw.override {pthreads = true;}; + }; + sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; inherit pkgconfig gmp gettext; From f923c3220485b057cacbabb3396ba42d1dbb2b97 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 12 Nov 2013 23:28:27 +0100 Subject: [PATCH 244/760] boost: fix hardcoded hash Closes #1209 Signed-off-by: Moritz Ulrich --- pkgs/development/libraries/boost/header-only-wrapper.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix index d32462d37208..6027ea5c3939 100644 --- a/pkgs/development/libraries/boost/header-only-wrapper.nix +++ b/pkgs/development/libraries/boost/header-only-wrapper.nix @@ -8,10 +8,7 @@ in stdenv.mkDerivation { name = "boost-headers-${version}"; - src = fetchurl { - url = "mirror://sourceforge/boost/${pkgid}.tar.bz2"; - sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4"; - }; + src = boost.src; phases = [ "installPhase" ]; From 26d7598d464127157d3ca49d9c71561d70f1d209 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 13 Nov 2013 01:52:57 +0100 Subject: [PATCH 245/760] networkmanager NixOS service: Make it possible to append or insert name servers in /etc/resolv.conf --- .../services/networking/networkmanager.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2e8d17d872d2..62bf38e4e708 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -55,15 +55,19 @@ let fi ''; + ns = xs: writeText "nameservers" ( + concatStrings (map (s: "nameserver ${s}\n") xs) + ); + overrideNameserversScript = writeScript "02overridedns" '' #!/bin/sh - ${optionalString cfg.overrideNameservers "${gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf"} - ${concatStrings (map (s: '' - ${optionalString cfg.appendNameservers - "${gnused}/bin/sed -i '/nameserver ${s}/d' /etc/resolv.conf" - } - echo 'nameserver ${s}' >> /etc/resolv.conf - '') config.networking.nameservers)} + tmp=`${coreutils}/bin/mktemp` + ${gnused}/bin/sed '/nameserver /d' /etc/resolv.conf > $tmp + ${gnugrep}/bin/grep 'nameserver ' /etc/resolv.conf | \ + ${gnugrep}/bin/grep -vf ${ns (cfg.appendNameservers ++ cfg.insertNameservers)} > $tmp.ns + ${optionalString (cfg.appendNameservers != []) "${coreutils}/bin/cat $tmp $tmp.ns ${ns cfg.appendNameservers} > /etc/resolv.conf"} + ${optionalString (cfg.insertNameservers != []) "${coreutils}/bin/cat $tmp ${ns cfg.insertNameservers} $tmp.ns > /etc/resolv.conf"} + ${coreutils}/bin/rm -f $tmp $tmp.ns ''; in { @@ -95,23 +99,21 @@ in { apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list; }; - overrideNameservers = mkOption { - default = false; + appendNameservers = mkOption { + type = types.listOf types.string; + default = []; description = '' - If enabled, any nameservers received by DHCP or configured in - NetworkManager will be replaced by the nameservers configured - in the networking.nameservers option. This - option overrides the appendNameservers option - if both are enabled. + A list of name servers that should be appended + to the ones configured in NetworkManager or received by DHCP. ''; }; - appendNameservers = mkOption { - default = false; + insertNameservers = mkOption { + type = types.listOf types.string; + default = []; description = '' - If enabled, the name servers configured in the - networking.nameservers option will be appended - to the ones configured in NetworkManager or received by DHCP. + A list of name servers that should be inserted before + the ones configured in NetworkManager or received by DHCP. ''; }; @@ -144,7 +146,7 @@ in { { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } - ] ++ pkgs.lib.optional (cfg.overrideNameservers || cfg.appendNameservers) + ] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; }; From fda66c9ff4b2ede4cb826a60e8d911b6988e8a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 12 Nov 2013 15:50:53 +0100 Subject: [PATCH 246/760] Updating tox to master --- .../networking/instant-messengers/toxic/default.nix | 6 +++--- pkgs/development/libraries/libtoxcore/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index c2af1274a24c..59aef8c6c43a 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,8 +2,8 @@ , libtoxcore, pkgconfig }: let - version = "75d356e52a"; - date = "20131011"; + version = "5570b7c98aa"; + date = "20131112"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "14wyvms8l07sl88g8y6g2jv95sq7cnhbaqf4n32xxilch8rymq47"; + sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0098ddb9d77a..a3de6f99418d 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "31f5d7a8ab"; - date = "20131011"; + version = "18c98eb"; + date = "20131112"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r"; + sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh"; }; preConfigure = '' From 829b29153b66e32e30d213ed115911c1f1a8d9a6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 13 Nov 2013 12:45:40 +0200 Subject: [PATCH 247/760] clean up git revision handling in several packages --- pkgs/applications/misc/dunst/default.nix | 2 +- pkgs/applications/networking/remote/freerdp/unstable.nix | 2 +- pkgs/misc/uboot/guruplug.nix | 2 +- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 6 ++++-- pkgs/tools/networking/cjdns/default.nix | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index cb594e494dba..1b61d75ddf2e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; - name = "dunst-${rev}"; + name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}"; # 1.0.0 release doesn't include 100% CPU fix # https://github.com/knopwob/dunst/issues/98 diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index ef8ddf8b0e3b..cce3d23d1945 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -25,7 +25,7 @@ assert printerSupport -> cups != null; let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in stdenv.mkDerivation rec { - name = "freerdp-1.1pre${rev}"; + name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index b1f4cab7b735..258ba999bf88 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -10,7 +10,7 @@ let rev = "f106056095049c2c748c2a2797e5353295240e04"; in stdenv.mkDerivation { - name = "uboot-guruplug-0.0pre${rev}"; + name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "git://git.denx.de/u-boot-marvell.git"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b60b6134fdde..5c36bb097812 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -10,7 +10,7 @@ let rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; - version = "1.0pre-${rev}"; + version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; in stdenv.mkDerivation { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e683df5a7fe1..54b089bd08e9 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -3,14 +3,16 @@ assert par2Support -> par2cmdline != null; +let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in + with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25-rc1-107-g96c6fa2"; + name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/bup/bup.git"; - rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + inherit rev; sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index a76e351efc49..ffe22a93d0d4 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -4,7 +4,7 @@ let rev = "f7b02ac0cc"; in stdenv.mkDerivation { - name = "cjdns-git-20130620-${rev}"; + name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; From 4441ae7424381c03e71e52ebbf4ac6cc69e11f5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Nov 2013 11:16:02 +0100 Subject: [PATCH 248/760] haskell-cpu: update to version 0.1.2 --- pkgs/development/libraries/haskell/cpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index dc27553c2a3b..3d8ba2784f59 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpu"; - version = "0.1.1"; - sha256 = "0ygkxx8ksa0rh63569d3g0w8pzgwg6062sd4yyi3q646zcmryhj6"; + version = "0.1.2"; + sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn"; isLibrary = true; isExecutable = true; meta = { From f646bb6c8bdff30c27d50ffb7456d59c86ead268 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Nov 2013 11:16:02 +0100 Subject: [PATCH 249/760] haskell-crypto-numbers: update to version 0.2.3 --- pkgs/development/libraries/haskell/crypto-numbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 7080611f9c47..7633c479e7c0 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.2.2"; - sha256 = "1ia39al01hb65h23ql0mr5vwzj8slv98i7a22cix8p0b6an1w3vv"; + version = "0.2.3"; + sha256 = "0nx2mlf40127j7vas7liqy2yzfg4alfaxcjilcxk99kavpaanzgp"; buildDepends = [ cryptoRandom vector ]; testDepends = [ byteable cryptoRandom HUnit QuickCheck testFramework From 37f44b6089994c3853895439095b1aa2b5ef3cd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Nov 2013 11:16:02 +0100 Subject: [PATCH 250/760] haskell-crypto-pubkey: update to version 0.2.2 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index a4f98e5a2a1a..aa400c736cb1 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.1"; - sha256 = "06cb2h9c3r1ycgcw7scc191gbr86qi8pxil07207n5fccq3vpjys"; + version = "0.2.2"; + sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; From e006e06be6fa52da06b26e8c22cce99ea0f154d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Nov 2013 11:16:02 +0100 Subject: [PATCH 251/760] haskell-pem: update to version 0.2.1 --- pkgs/development/libraries/haskell/pem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 473f15c4d1f3..0c331e1bda5b 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pem"; - version = "0.2.0"; - sha256 = "1hmsyavqzjx1chbn4a8vf0r2wz2fg0xl9cxgja4ap04si3qr458v"; + version = "0.2.1"; + sha256 = "05ln372ad89993v07q108l9al8jgjpzardpl02pziwwacdcj1j17"; buildDepends = [ base64Bytestring mtl ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit From e815e4026a6815fbd54c1a41769bbb38d3d3e17a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Nov 2013 11:08:19 +0100 Subject: [PATCH 252/760] mediawiki: Update to 1.20.7 --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index dcc05b03891b..f1b5b675161b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -72,11 +72,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.20.5"; + name= "mediawiki-1.20.7"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz"; - sha256 = "0ix6khrilfdncjqnh41xjs0bd49i1q0rywycjaixjfpwj6vjbqbl"; + sha256 = "0cdl2mq3nw1jymanlxn7pi3qbf5y5003q53kmc8dip73nvrwnfxm"; }; skins = config.skins; From 847544d89536dbca6e33636ac59b9163eaa0af99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Nov 2013 11:13:07 +0100 Subject: [PATCH 253/760] php: Update to 5.4.21 --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 3edf25b0cd94..1e3d73fa884e 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.20"; + version = "5.4.21"; name = "php-${version}"; @@ -235,7 +235,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" ]; - sha256 = "1qarcxj46rzkmql3w2dln0hxzs349ph31fxcslizxch1ig7l43nd"; + sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za"; name = "php-${version}.tar.bz2"; }; From af7162b7a38b571812138eb3e2613afb06106e29 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Nov 2013 11:20:46 +0100 Subject: [PATCH 254/760] linux: Update to 3.4.69 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 5b0fa29d1524..e6f801d67e2d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.68"; + version = "3.4.69"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0z1gbz13px37ny7652cy1s5az5g6yh3bnz4zayab72rzmhgbpsyh"; + sha256 = "0kwln802cxv8dg45r5kw8fi4npjczg5xf98hx7i9xwa33f57iv7g"; }; features.iwlwifi = true; From a8d63681dbde6b343a727df0fc9c5a3130f8f242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 13 Nov 2013 23:25:48 +0100 Subject: [PATCH 255/760] stlink: fix package name To stop nixpkgs-lint from saying "stlink: package has no version". --- pkgs/development/tools/misc/stlink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 675f8f7f2af6..68c7fed0812f 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -8,7 +8,7 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" stdenv.mkDerivation { - name = "stlink-git20130306"; + name = "stlink-20130306"; src = fetchgit { url = git://github.com/texane/stlink.git; From fbfa569efddd383509c9346b6d577192f0f386d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 13 Nov 2013 23:28:24 +0100 Subject: [PATCH 256/760] stlink: fix chroot build Add sha256 attribute to fetchgit to make it a fixed-output derivation (needed for chroot builds). --- pkgs/development/tools/misc/stlink/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 68c7fed0812f..c4dfa99becdc 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://github.com/texane/stlink.git; rev = "5be889e3feb75fc7f594012c4855b4dc16940050"; + sha256 = "1xbfr1kz4k6hhl0xpqn1vi83fdynjxx3ymn9gb7b0pb7h6ncjcyr"; }; buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; From e597d102d8f11d892d780ea1c0109a2797c374ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Nov 2013 15:29:52 +0100 Subject: [PATCH 257/760] git: Update to 1.8.4.3 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fb2e34c7aac9..050cfd1aabee 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.4"; + version = "1.8.4.3"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "156bwqqgaw65rsvbb4wih5jfg94bxyf6p16mdwf0ky3f4ln55s2i"; + sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From 38185f8e5158941df2b6baaab09960ffef2f0279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 14 Nov 2013 11:09:28 +0100 Subject: [PATCH 258/760] pypy: 2.1 -> 2.2 --- pkgs/development/interpreters/pypy/{2.1 => 2.2}/default.nix | 4 ++-- pkgs/development/interpreters/pypy/{2.1 => 2.2}/setup-hook.sh | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/interpreters/pypy/{2.1 => 2.2}/default.nix (97%) rename pkgs/development/interpreters/pypy/{2.1 => 2.2}/setup-hook.sh (82%) diff --git a/pkgs/development/interpreters/pypy/2.1/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix similarity index 97% rename from pkgs/development/interpreters/pypy/2.1/default.nix rename to pkgs/development/interpreters/pypy/2.2/default.nix index f80a1dc72428..b418b50c0897 100644 --- a/pkgs/development/interpreters/pypy/2.1/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.1"; + majorVersion = "2.2"; version = "${majorVersion}"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri"; + sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] diff --git a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh similarity index 82% rename from pkgs/development/interpreters/pypy/2.1/setup-hook.sh rename to pkgs/development/interpreters/pypy/2.2/setup-hook.sh index 87874f0370be..35f4915569e6 100644 --- a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.1/site-packages" + p="$i/lib/pypy2.2/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d86b360b89c..59694147f59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3235,7 +3235,7 @@ let libX11 = xlibs.libX11; }; - pypy = callPackage ../development/interpreters/pypy/2.1 { }; + pypy = callPackage ../development/interpreters/pypy/2.2 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { From 6555e31fb4a13640b8df2487a906051bc94688bf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 10:42:58 -0500 Subject: [PATCH 259/760] ImageMagick and asciidoc build on 64-bit darwin Tested by @zefhemel Signed-off-by: Shea Levy --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0a6aed814ae5..aa0bdbfe56ce 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index aeeaf04e7bad..869fb99c63fe 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; maintainers = [ maintainers.bjornfor ]; }; } From 5fa298c1aaef354f8934094a7db73e5cdeb086a7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 13:36:08 -0500 Subject: [PATCH 260/760] Update npm packages to latest npm2nix Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/node-packages-generated.nix | 250 ++++++++++++++------- pkgs/top-level/node-packages.nix | 19 +- 3 files changed, 180 insertions(+), 91 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59694147f59b..85b0aaed6f1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1203,7 +1203,7 @@ let nodejs = callPackage ../development/web/nodejs {}; nodePackages = recurseIntoAttrs (import ./node-packages.nix { - inherit pkgs stdenv nodejs fetchurl; + inherit pkgs stdenv nodejs fetchurl fetchgit; neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; self = pkgs.nodePackages; }); diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index d4fbf468a5e9..43fe8b0b4964 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, lib }: +{ self, fetchurl, fetchgit ? null, lib }: { by-spec."CSSselect"."0.x" = @@ -496,7 +496,7 @@ by-version."aws-sdk"."2.0.0-rc1" = lib.makeOverridable self.buildNodePackage { name = "aws-sdk-2.0.0-rc1"; src = [ - (self.patchLatest { + (self.patchSource fetchurl { url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc1.tgz"; sha1 = "8f3b045ffa2050695a692f12ea76eff6d01a2349"; }) @@ -1323,13 +1323,13 @@ passthru.names = [ "cheerio" ]; }; by-spec."cheerio"."~0.12.0" = - self.by-version."cheerio"."0.12.3"; - by-version."cheerio"."0.12.3" = lib.makeOverridable self.buildNodePackage { - name = "cheerio-0.12.3"; + self.by-version."cheerio"."0.12.4"; + by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage { + name = "cheerio-0.12.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.3.tgz"; - sha1 = "8eb05ace0a3fc72d9d9ce0b5d364fe8bb565d7fa"; + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.12.4.tgz"; + sha1 = "c199626e9e1eb0d4233a91a4793e7f8aaa69a18b"; }) ]; buildInputs = @@ -1345,7 +1345,7 @@ passthru.names = [ "cheerio" ]; }; by-spec."cheerio"."~0.12.1" = - self.by-version."cheerio"."0.12.3"; + self.by-version."cheerio"."0.12.4"; by-spec."cheerio-select"."*" = self.by-version."cheerio-select"."0.0.3"; by-version."cheerio-select"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -1457,13 +1457,13 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.0.0" = - self.by-version."clean-css"."2.0.0"; - by-version."clean-css"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.0.0"; + self.by-version."clean-css"."2.0.1"; + by-version."clean-css"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.0.tgz"; - sha1 = "ece63c9ad25e3813c89a95566795a3d0a2ff0dac"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.0.1.tgz"; + sha1 = "12770bc087fa8287174626db3d46de278b7c4f86"; }) ]; buildInputs = @@ -1996,7 +1996,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.3" + self.by-version."debug"."0.7.4" self.by-version."methods"."0.0.1" self.by-version."raw-body"."0.0.3" self.by-version."negotiator"."0.3.0" @@ -2028,7 +2028,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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -2056,7 +2056,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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -2087,7 +2087,7 @@ self.by-version."fresh"."0.2.0" self.by-version."pause"."0.0.1" self.by-version."uid2"."0.0.2" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."methods"."0.0.1" ]; peerDependencies = [ @@ -2654,13 +2654,13 @@ passthru.names = [ "dateformat" ]; }; by-spec."debug"."*" = - self.by-version."debug"."0.7.3"; - by-version."debug"."0.7.3" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.7.3"; + self.by-version."debug"."0.7.4"; + by-version."debug"."0.7.4" = lib.makeOverridable self.buildNodePackage { + name = "debug-0.7.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.3.tgz"; - sha1 = "ba7ae369799066a28d234fb8dad6f05837839da8"; + url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }) ]; buildInputs = @@ -2690,9 +2690,9 @@ passthru.names = [ "debug" ]; }; by-spec."debug"."~0.7.0" = - self.by-version."debug"."0.7.3"; + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = - self.by-version."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 { @@ -3320,7 +3320,7 @@ 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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -3372,7 +3372,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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -3403,7 +3403,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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -3414,13 +3414,13 @@ by-spec."express"."~3.4.4" = self.by-version."express"."3.4.4"; by-spec."express-form"."*" = - self.by-version."express-form"."0.10.0"; - by-version."express-form"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "express-form-0.10.0"; + self.by-version."express-form"."0.10.1"; + by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "express-form-0.10.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-form/-/express-form-0.10.0.tgz"; - sha1 = "f16180c3804007a548b2d74c21400ce3fc1c00cd"; + url = "http://registry.npmjs.org/express-form/-/express-form-0.10.1.tgz"; + sha1 = "542f43cf276c33f8ec8836b571aa3365505609a8"; }) ]; buildInputs = @@ -3435,7 +3435,7 @@ ]; passthru.names = [ "express-form" ]; }; - "express-form" = self.by-version."express-form"."0.10.0"; + "express-form" = self.by-version."express-form"."0.10.1"; by-spec."express-partials"."0.0.6" = self.by-version."express-partials"."0.0.6"; by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -3590,6 +3590,24 @@ ]; passthru.names = [ "fileset" ]; }; + by-spec."findit".">=1.1.0 <2.0.0" = + self.by-version."findit"."1.1.0"; + by-version."findit"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "findit-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/findit/-/findit-1.1.0.tgz"; + sha1 = "7104c60060f838d2298bd526b16add6ce733f9ac"; + }) + ]; + buildInputs = + (self.nativeDeps."findit" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "findit" ]; + }; 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 { @@ -3988,6 +4006,28 @@ ]; passthru.names = [ "fresh" ]; }; + by-spec."fs-extra"."~0.6.1" = + self.by-version."fs-extra"."0.6.4"; + by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { + name = "fs-extra-0.6.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; + }) + ]; + buildInputs = + (self.nativeDeps."fs-extra" or []); + deps = [ + self.by-version."ncp"."0.4.2" + self.by-version."mkdirp"."0.3.5" + self.by-version."jsonfile"."1.0.1" + self.by-version."rimraf"."2.2.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fs-extra" ]; + }; by-spec."fs-walk"."*" = self.by-version."fs-walk"."0.0.1"; by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4008,6 +4048,27 @@ passthru.names = [ "fs-walk" ]; }; "fs-walk" = self.by-version."fs-walk"."0.0.1"; + by-spec."fs.extra".">=1.2.0 <2.0.0" = + self.by-version."fs.extra"."1.2.1"; + by-version."fs.extra"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "fs.extra-1.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; + sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733"; + }) + ]; + buildInputs = + (self.nativeDeps."fs.extra" or []); + deps = [ + self.by-version."mkdirp"."0.3.5" + self.by-version."fs-extra"."0.6.4" + self.by-version."walk"."2.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fs.extra" ]; + }; by-spec."fstream"."0" = self.by-version."fstream"."0.1.24"; by-version."fstream"."0.1.24" = lib.makeOverridable self.buildNodePackage { @@ -4158,7 +4219,7 @@ (self.nativeDeps."generator-webapp" or []); deps = [ self.by-version."yeoman-generator"."0.13.4" - self.by-version."cheerio"."0.12.3" + self.by-version."cheerio"."0.12.4" ]; peerDependencies = [ self.by-version."yo"."1.0.4" @@ -4497,7 +4558,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-cssmin" or []); deps = [ - self.by-version."clean-css"."2.0.0" + self.by-version."clean-css"."2.0.1" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4528,13 +4589,13 @@ }; "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.7.1"; by-spec."grunt-contrib-less"."*" = - self.by-version."grunt-contrib-less"."0.8.1"; - by-version."grunt-contrib-less"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "grunt-contrib-less-0.8.1"; + self.by-version."grunt-contrib-less"."0.8.2"; + by-version."grunt-contrib-less"."0.8.2" = lib.makeOverridable self.buildNodePackage { + name = "grunt-contrib-less-0.8.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.1.tgz"; - sha1 = "0b819ebcadf737177fc7b9c4a239ed9d5834fbe4"; + url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.8.2.tgz"; + sha1 = "d94e5c69251aec1a48ee154147b808a10ff6f711"; }) ]; buildInputs = @@ -4548,7 +4609,7 @@ ]; passthru.names = [ "grunt-contrib-less" ]; }; - "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.1"; + "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.8.2"; by-spec."grunt-contrib-requirejs"."*" = self.by-version."grunt-contrib-requirejs"."0.4.1"; by-version."grunt-contrib-requirejs"."0.4.1" = lib.makeOverridable self.buildNodePackage { @@ -5744,6 +5805,24 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; + by-spec."jsonfile"."~1.0.1" = + self.by-version."jsonfile"."1.0.1"; + by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "jsonfile-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonfile" ]; + }; by-spec."jsontool"."*" = self.by-version."jsontool"."7.0.0"; by-version."jsontool"."7.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6146,7 +6225,7 @@ deps = [ self.by-version."mime"."1.2.11" self.by-version."xml2js"."0.2.8" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."stream-counter"."0.1.0" ]; peerDependencies = [ @@ -6971,7 +7050,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.3" + self.by-version."debug"."0.7.4" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.3" ]; @@ -7578,6 +7657,8 @@ ]; passthru.names = [ "ncp" ]; }; + by-spec."ncp"."~0.4.2" = + self.by-version."ncp"."0.4.2"; by-spec."negotiator"."0.2.5" = self.by-version."negotiator"."0.2.5"; by-version."negotiator"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -7772,13 +7853,13 @@ passthru.names = [ "node-gyp" ]; }; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.5.0"; - by-version."node-inspector"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.5.0"; + self.by-version."node-inspector"."0.6.0"; + by-version."node-inspector"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.5.0.tgz"; - sha1 = "3104821cb4d6436212331ef3f3539943fd370603"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.6.0.tgz"; + sha1 = "4981dbbaf3cc3cc7a75040af17c4120c559ffbb0"; }) ]; buildInputs = @@ -7795,7 +7876,7 @@ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.5.0"; + "node-inspector" = self.by-version."node-inspector"."0.6.0"; by-spec."node-syslog"."1.1.3" = self.by-version."node-syslog"."1.1.3"; by-version."node-syslog"."1.1.3" = lib.makeOverridable self.buildNodePackage { @@ -7962,13 +8043,13 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."0.9.6"; - by-version."nodemon"."0.9.6" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.9.6"; + self.by-version."nodemon"."0.9.7"; + by-version."nodemon"."0.9.7" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.6.tgz"; - sha1 = "7a0b135b9b9c56e7a73025bbac8d6d3dc8dcd5c9"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.7.tgz"; + sha1 = "bfce004cf399d6785809addaabd6821e20805bd6"; }) ]; buildInputs = @@ -7980,7 +8061,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."0.9.6"; + "nodemon" = self.by-version."nodemon"."0.9.7"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8223,13 +8304,13 @@ passthru.names = [ "npm-user-validate" ]; }; by-spec."npm2nix"."*" = - self.by-version."npm2nix"."5.2.0"; - by-version."npm2nix"."5.2.0" = lib.makeOverridable self.buildNodePackage { - name = "npm2nix-5.2.0"; + self.by-version."npm2nix"."5.3.0"; + by-version."npm2nix"."5.3.0" = lib.makeOverridable self.buildNodePackage { + name = "npm2nix-5.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.2.0.tgz"; - sha1 = "cce9016d598ad4fed4c98aa1830b40104214df4b"; + url = "http://registry.npmjs.org/npm2nix/-/npm2nix-5.3.0.tgz"; + sha1 = "ff5d66824033dd8815cc74c661ea30956eba2664"; }) ]; buildInputs = @@ -8240,12 +8321,15 @@ self.by-version."npm-registry-client"."0.2.27" self.by-version."npmconf"."0.1.1" self.by-version."tar"."0.1.17" + self.by-version."temp"."0.6.0" + self.by-version."fs.extra"."1.2.1" + self.by-version."findit"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "npm2nix" ]; }; - "npm2nix" = self.by-version."npm2nix"."5.2.0"; + "npm2nix" = self.by-version."npm2nix"."5.3.0"; by-spec."npmconf"."0.0.24" = self.by-version."npmconf"."0.0.24"; by-version."npmconf"."0.0.24" = lib.makeOverridable self.buildNodePackage { @@ -10304,7 +10388,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."mime"."1.2.11" self.by-version."fresh"."0.2.0" self.by-version."range-parser"."0.0.4" @@ -10326,7 +10410,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = [ - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."mime"."1.2.6" self.by-version."fresh"."0.1.0" self.by-version."range-parser"."0.0.4" @@ -10852,13 +10936,13 @@ passthru.names = [ "ssh-agent" ]; }; by-spec."ssh2"."~0.2.12" = - self.by-version."ssh2"."0.2.13"; - by-version."ssh2"."0.2.13" = lib.makeOverridable self.buildNodePackage { - name = "ssh2-0.2.13"; + self.by-version."ssh2"."0.2.14"; + by-version."ssh2"."0.2.14" = lib.makeOverridable self.buildNodePackage { + name = "ssh2-0.2.14"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.13.tgz"; - sha1 = "b4596d26b60651d4b764a40043c7781a2fbbf6a1"; + url = "http://registry.npmjs.org/ssh2/-/ssh2-0.2.14.tgz"; + sha1 = "6f93df62f1475cbe5b45924da568643b9ac7388a"; }) ]; buildInputs = @@ -11024,13 +11108,13 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.40.0"; - by-version."stylus"."0.40.0" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.40.0"; + self.by-version."stylus"."0.40.2"; + by-version."stylus"."0.40.2" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.40.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.40.0.tgz"; - sha1 = "497b6242f3952417482acad65627a6988125b634"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.40.2.tgz"; + sha1 = "4b4f7a2d8a6aeecfe0a62ef0e2d8a45a78b1e2bd"; }) ]; buildInputs = @@ -11038,14 +11122,14 @@ deps = [ self.by-version."cssom"."0.2.5" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."sax"."0.5.5" ]; peerDependencies = [ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.40.0"; + "stylus" = self.by-version."stylus"."0.40.2"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -11061,7 +11145,7 @@ deps = [ self.by-version."cssom"."0.2.5" self.by-version."mkdirp"."0.3.5" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -11105,7 +11189,7 @@ 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.3" + self.by-version."debug"."0.7.4" ]; peerDependencies = [ ]; @@ -11154,7 +11238,7 @@ 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.3" + self.by-version."debug"."0.7.4" self.by-version."reduce-component"."1.0.1" ]; peerDependencies = [ @@ -11830,7 +11914,7 @@ self.by-version."socket.io"."0.9.16" self.by-version."moment"."2.4.0" self.by-version."async"."0.2.9" - self.by-version."ssh2"."0.2.13" + self.by-version."ssh2"."0.2.14" self.by-version."rc"."0.3.1" self.by-version."uuid"."1.4.1" self.by-version."winston"."0.7.2" @@ -12184,6 +12268,8 @@ passthru.names = [ "walk" ]; }; "walk" = self.by-version."walk"."2.2.1"; + by-spec."walk"."~2.2.1" = + self.by-version."walk"."2.2.1"; by-spec."watch"."0.5.x" = self.by-version."watch"."0.5.1"; by-version."watch"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -12703,7 +12789,7 @@ self.by-version."glob"."3.1.21" self.by-version."nopt"."2.1.2" self.by-version."cli-table"."0.2.0" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" ]; peerDependencies = [ @@ -12723,7 +12809,7 @@ buildInputs = (self.nativeDeps."yeoman-generator" or []); deps = [ - self.by-version."cheerio"."0.12.3" + self.by-version."cheerio"."0.12.4" self.by-version."request"."2.25.0" self.by-version."rimraf"."2.2.2" self.by-version."tar"."0.1.18" @@ -12733,7 +12819,7 @@ self.by-version."lodash"."1.3.1" self.by-version."mkdirp"."0.3.5" self.by-version."glob"."3.2.7" - self.by-version."debug"."0.7.3" + self.by-version."debug"."0.7.4" self.by-version."isbinaryfile"."0.1.9" self.by-version."dargs"."0.1.0" self.by-version."async"."0.2.9" diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index dcc024c7c5d6..a6c17872f800 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,6 +1,6 @@ -{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self, generated ? ./node-packages-generated.nix }: +{ pkgs, stdenv, nodejs, fetchurl, fetchgit, neededNatives, self, generated ? ./node-packages-generated.nix }: -{ +rec { nativeDeps = { "node-expat" = [ pkgs.expat ]; "rbytes" = [ pkgs.openssl ]; @@ -12,15 +12,18 @@ inherit (pkgs) runCommand; }; - patchLatest = srcAttrs: - let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' + patchSource = fn: srcAttrs: + let src = fn srcAttrs; in pkgs.runCommand src.name {} '' mkdir unpack cd unpack - tar xf ${src} + unpackFile ${src} mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json - tar cf $out * + sed -i -e "s/: \"latest\"/: \"*\"/" -e "s/: \"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json + mv * $out ''; + # Backwards compat + patchLatest = patchSource fetchurl; + /* Put manual packages below here (ideally eventually managed by npm2nix */ -} // import generated { inherit self fetchurl; inherit (pkgs) lib; } +} // import generated { inherit self fetchurl fetchgit; inherit (pkgs) lib; } From a94c71a8ddb929e61e5a0f12733cbc9cb430c768 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 13:40:56 -0500 Subject: [PATCH 261/760] Add hipache nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 87 ++++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 88 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 43fe8b0b4964..841061bd77a6 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -4906,6 +4906,30 @@ ]; passthru.names = [ "hawk" ]; }; + by-spec."hipache"."*" = + self.by-version."hipache"."0.2.4"; + by-version."hipache"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "hipache-0.2.4"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/hipache/-/hipache-0.2.4.tgz"; + sha1 = "1d6a06bf88cac084b5fcd01959392c8b4889ec65"; + }) + ]; + buildInputs = + (self.nativeDeps."hipache" or []); + deps = [ + self.by-version."read-installed"."0.2.2" + self.by-version."http-proxy"."0.10.0" + self.by-version."redis"."0.8.6" + self.by-version."lru-cache"."2.2.4" + self.by-version."optimist"."0.3.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hipache" ]; + }; + "hipache" = self.by-version."hipache"."0.2.4"; by-spec."hiredis"."*" = self.by-version."hiredis"."0.1.15"; by-version."hiredis"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -5117,6 +5141,29 @@ ]; passthru.names = [ "http-auth" ]; }; + by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" = + self.by-version."http-proxy"."0.10.0"; + by-version."http-proxy"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "http-proxy-0.10.0"; + src = [ + (fetchgit { + url = "git://github.com/samalba/node-http-proxy"; + rev = "5a5a41081165435867b4e5d3a2a269d099d21c56"; + sha256 = "ea865a91272903ed8506aa572e6a2b58f83f78e9da52f265c732d85a4f7b4380"; + }) + ]; + buildInputs = + (self.nativeDeps."http-proxy" or []); + deps = [ + self.by-version."colors"."0.6.2" + self.by-version."optimist"."0.3.7" + self.by-version."pkginfo"."0.2.3" + self.by-version."utile"."0.1.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-proxy" ]; + }; by-spec."http-proxy"."~0.10" = self.by-version."http-proxy"."0.10.3"; by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage { @@ -9499,6 +9546,28 @@ self.by-version."read"."1.0.5"; by-spec."read"."~1.0.4" = self.by-version."read"."1.0.5"; + by-spec."read-installed"."0.2.2" = + self.by-version."read-installed"."0.2.2"; + by-version."read-installed"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "read-installed-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; + sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; + }) + ]; + buildInputs = + (self.nativeDeps."read-installed" or []); + deps = [ + self.by-version."semver"."2.2.1" + self.by-version."slide"."1.1.5" + self.by-version."read-package-json"."1.1.4" + self.by-version."graceful-fs"."1.2.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "read-installed" ]; + }; by-spec."read-installed"."~0.2.2" = self.by-version."read-installed"."0.2.4"; by-version."read-installed"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -9683,6 +9752,24 @@ ]; passthru.names = [ "redis" ]; }; + by-spec."redis"."0.8.x" = + self.by-version."redis"."0.8.6"; + by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage { + name = "redis-0.8.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz"; + sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8"; + }) + ]; + buildInputs = + (self.nativeDeps."redis" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "redis" ]; + }; by-spec."redis".">= 0.6.6" = self.by-version."redis"."0.9.0"; by-spec."reds"."0.1.4" = diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index d3ac89f96866..dbbc28469524 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -108,4 +108,5 @@ , "x509" , "owl-deepcopy" , "meat" +, "hipache" ] From 0b0bded848b84e9b33d9ed954800513e93e0d550 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 13:58:38 -0500 Subject: [PATCH 262/760] Better json parsing Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index a6c17872f800..1633694155e9 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -18,7 +18,7 @@ rec { cd unpack unpackFile ${src} mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" -e "s/: \"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json + sed -i -e "s/:\s*\"latest\"/: *\"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json mv * $out ''; From 60428f1d49a8a0425cf457846da688d63817cf5a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 14:11:53 -0500 Subject: [PATCH 263/760] In nodePackages.patchSource, make the source tree writable Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 1633694155e9..6261d87cc915 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -17,9 +17,10 @@ rec { mkdir unpack cd unpack unpackFile ${src} + chmod -R +w */ mv */ package 2>/dev/null || true sed -i -e "s/:\s*\"latest\"/: *\"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json - mv * $out + mv */ $out ''; # Backwards compat From 03858122be7f0fa2e22aed49e0b0c8be0808f0f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 14:15:39 -0500 Subject: [PATCH 264/760] D'oh Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 6261d87cc915..56bcda57aa0d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -19,7 +19,7 @@ rec { unpackFile ${src} chmod -R +w */ mv */ package 2>/dev/null || true - sed -i -e "s/:\s*\"latest\"/: *\"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json + sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s*\"git\(\+\(ssh\|http\|https\)\)\?\:\/\/[^\"]*\"/: \"*\"/" package/package.json mv */ $out ''; From c0df12ccf062539cf216c392eb5721c66985b051 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 15 Nov 2013 00:17:21 +0400 Subject: [PATCH 265/760] mirage: fix localization --- pkgs/applications/graphics/mirage/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index dd1fbcc7e073..cd5388c1b88f 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { buildInputs = [ stdenv libX11 gettext ]; + patchPhase = '' + sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py + ''; + pythonPath = [ pygtk pil ]; meta = { From ac6bc8c990ac8298abd010ed262769bf09616185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 14 Nov 2013 22:57:26 +0100 Subject: [PATCH 266/760] vlc: minor update 2.1.0 -> .1 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3d48b296ad9d..de6ad9021505 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1xs1zsjip6ljqyy5jlqf14ncda4pjx166bqvjqgcyskq66m7s5yj"; + sha256 = "14mrcswz5mz976dmplbrdm3mkwjrksspvkignhbnbvrrp77r571k"; }; buildInputs = From cc69da4314d4f315f5b178f0796efdc80e0141d4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 18:18:27 -0500 Subject: [PATCH 267/760] Put /efi and /loader on the main livecd partition for efi booting with unetbootin Fixes #248, mostly Signed-off-by: Shea Levy --- nixos/modules/installer/cd-dvd/iso-image.nix | 40 +++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index b803a3f188b9..00a9e91c7338 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -44,31 +44,29 @@ let # The efi boot image + efiDir = pkgs.runCommand "efi-directory" {} '' + mkdir -p $out/efi/boot + cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/efi/boot/boot${targetArch}.efi + mkdir -p $out/loader/entries + echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf + echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf + echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf + echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf + echo "default nixos-livecd" > $out/loader/loader.conf + echo "timeout 5" >> $out/loader/loader.conf + ''; + efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools ]; } '' #Let's hope 10M is enough dd bs=2048 count=5120 if=/dev/zero of="$out" ${pkgs.dosfstools}/sbin/mkfs.vfat "$out" - mmd -i "$out" efi - mmd -i "$out" efi/boot - mmd -i "$out" efi/nixos - mmd -i "$out" loader - mmd -i "$out" loader/entries + mcopy -svi "$out" ${efiDir}/* :: + mmd -i "$out" boot mcopy -v -i "$out" \ - ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \ - ::efi/boot/boot${targetArch}.efi + ${config.boot.kernelPackages.kernel}/bzImage ::boot/bzImage mcopy -v -i "$out" \ - ${config.boot.kernelPackages.kernel}/bzImage ::bzImage - mcopy -v -i "$out" \ - ${config.system.build.initialRamdisk}/initrd ::efi/nixos/initrd - echo "title NixOS LiveCD" > boot-params - echo "linux /bzImage" >> boot-params - echo "initrd /efi/nixos/initrd" >> boot-params - echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params - mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf - echo "default nixos-livecd" > boot-params - echo "timeout 5" >> boot-params - mcopy -v -i "$out" boot-params ::loader/loader.conf + ${config.system.build.initialRamdisk}/initrd ::boot/initrd ''; targetArch = if pkgs.stdenv.isi686 then @@ -263,6 +261,12 @@ in { source = efiImg; target = "/boot/efi.img"; } + { source = "${efiDir}/efi"; + target = "/efi"; + } + { source = "${efiDir}/loader"; + target = "/loader"; + } ] ++ mapAttrsToList (n: v: { source = v; target = "/boot/${n}"; }) config.boot.loader.grub.extraFiles; # The Grub menu. From 04ce6241ac0dda3a9528ec23730ca5f3fc2d5987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Nov 2013 00:15:15 +0100 Subject: [PATCH 268/760] lttv: update 1.5-beta1 -> 1.5 This makes lttv build again with the new GTK+ version that was recently updated in nixpkgs. --- pkgs/development/tools/misc/lttv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index df9f81d02e63..5cf8b6649418 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { - name = "lttv-1.5-beta1"; + name = "lttv-1.5"; src = fetchurl { url = "http://lttng.org/files/packages/${name}.tar.bz2"; - sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc"; + sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; From fd7bc4ebfd0bd86a86606cbc4ee22fbab44c5515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 14 Nov 2013 21:55:10 +0100 Subject: [PATCH 269/760] kicad: update to latest stable The Kicad developers don't make releases, they maintain a stable branch that is "ready to be released at any moment". Update to latest stable branch version(s). The "version number" in the package name attribute is the date of the last modification to the branch. Also remove unused inputs: gtk, cups. --- .../science/electronics/kicad/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index cc53611493d0..11d2e770165d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11, -gettext, cups } : +{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext }: stdenv.mkDerivation rec { - name = "kicad-20130325"; + name = "kicad-20131025"; - src = fetchurl { - url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip"; - sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m"; + src = fetchbzr { + url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable"; + revision = 4024; + sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5"; }; srcLibrary = fetchbzr { url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; - revision = 220; - sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb"; + revision = 293; + sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i"; }; - cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; + cmakeFlags = "-DKICAD_STABLE_VERSION=ON"; # They say they only support installs to /usr or /usr/local, # so we have to handle this. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ unzip cmake mesa wxGTK zlib libX11 gettext ]; + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext ]; postInstall = '' mkdir library From 3203c7177c3e75aeea4f85cef607c78e6479a8c2 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 15 Nov 2013 13:09:30 +0000 Subject: [PATCH 270/760] haskellPackages.webRoutesBoomerang: new expression --- .../haskell/web-routes-boomerang/default.nix | 14 +++++++++++ .../libraries/haskell/web-routes/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/haskell/web-routes-boomerang/default.nix create mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix new file mode 100644 index 000000000000..602d95f45df5 --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -0,0 +1,14 @@ +{ cabal, boomerang, mtl, parsec, text, webRoutes }: + +cabal.mkDerivation (self: { + pname = "web-routes-boomerang"; + version = "0.28.0"; + sha256 = "1xp8p0fkwirrpssb9lnxl7fmlmrql28r2ywaa99gw9cdqxifzbbl"; + buildDepends = [ boomerang mtl parsec text webRoutes ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix new file mode 100644 index 000000000000..ce767e7b5f5b --- /dev/null +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -0,0 +1,23 @@ +{ cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck +, split, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, utf8String +}: + +cabal.mkDerivation (self: { + pname = "web-routes"; + version = "0.27.3"; + sha256 = "06a3b88gzbn7dr7hff2fjy1q7sxc479ha4g1wqsbjrb2ajrp376q"; + buildDepends = [ + blazeBuilder httpTypes mtl parsec split text utf8String + ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh + ]; + meta = { + description = "Library for maintaining correctness and composability of URLs within an application"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 22257a81f951..9d78706f721c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2250,6 +2250,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; WebBitsHtml = self.WebBitsHtml_1_0_2; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; + + webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; + CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; wlPprint = callPackage ../development/libraries/haskell/wl-pprint {}; From a8e31672284c2f894290fba5ff9e1aa6fd7c3a08 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:20:29 +0100 Subject: [PATCH 271/760] LuaJIT: New package Just-in-time compiler for lua 5.1 with strong focus on performance. Uses the same API as lua 5.1 which makes it extremely easy to integrate. --- .../interpreters/luajit/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/interpreters/luajit/default.nix diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix new file mode 100644 index 000000000000..f4a8e3169275 --- /dev/null +++ b/pkgs/development/interpreters/luajit/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation rec{ + version = "2.0.2"; + name = "LuaJIT-${version}"; + + src = fetchurl { + url="http://luajit.org/download/LuaJIT-2.0.2.tar.gz"; + sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; + }; + + installPhase = '' + mkdir -p $out + make install PREFIX=$out + ''; + + meta = { + description= "Just-in-time compiler and interpreter for lua 5.1."; + homepage = http://luajit.org; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b0aaed6f1f..aab9415294d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3174,6 +3174,8 @@ let lua = lua5; }; + luajit = callPackage ../development/interpreters/luajit {}; + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { }; From 49bf24649144edd7c356c0c79ee38cf54fba791c Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:41:33 +0100 Subject: [PATCH 272/760] Minifix: didn't use the name variable in the package. --- pkgs/development/interpreters/luajit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index f4a8e3169275..e5e3aed8d124 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec{ name = "LuaJIT-${version}"; src = fetchurl { - url="http://luajit.org/download/LuaJIT-2.0.2.tar.gz"; + url="http://luajit.org/download/${name}.tar.gz"; sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; }; From fe547ab1007cebde95758b6956f248818f96efbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Nov 2013 19:29:06 +0100 Subject: [PATCH 273/760] python-robotframework: new package Robot Framework is a generic test automation framework for acceptance testing and acceptance test-driven development (ATDD). http://robotframework.org/ --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6a6e1e60768..156bbc46faa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5494,6 +5494,29 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + + robotframework = buildPythonPackage rec { + version = "2.8.1"; + name = "robotframework-${version}"; + + src = fetchurl { + url = "https://robotframework.googlecode.com/files/${name}.tar.gz"; + sha256 = "04zwjri1j5py3fpbhy1xlc18bhbmdm2gbd58fwa2jnhmrha5dgnw"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Generic test automation framework"; + homepage = http://robotframework.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; From d4b3a7d68571a347719c9c9423833ea1fedbc418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Nov 2013 21:33:34 +0100 Subject: [PATCH 274/760] robotframework-ride: new package Robot Framework RIDE is a light-weight and intuitive editor for Robot Framework test case files. (It's more like an IDE.) --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 156bbc46faa0..75dd2bc12f0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5517,6 +5517,44 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; + robotframework-ride = buildPythonPackage rec { + version = "1.2.2"; + name = "robotframework-ride-${version}"; + + src = fetchurl { + url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + sha256 = "1yfvl0hdjjkwk90w3f3i23dxxk3yiyv4pbvnp4l7yd6cmxsia8f3"; + }; + + propagatedBuildInputs = [ pygments wxPython modules.sqlite3 ]; + + # Stop copying (read-only) permission bits from the nix store into $HOME, + # because that leads to this: + # IOError: [Errno 13] Permission denied: '/home/bfo/.robotframework/ride/settings.cfg' + postPatch = '' + sed -i "s|shutil\.copy(|shutil.copyfile(|" src/robotide/preferences/settings.py + ''; + + # ride_postinstall.py checks that needed deps are installed and creates a + # desktop shortcut. We don't really need it and it clutters up bin/ so + # remove it. + postInstall = '' + rm -f "$out/bin/ride_postinstall.py" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Light-weight and intuitive editor for Robot Framework test case files"; + homepage = https://code.google.com/p/robotframework-ride/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; From f13bcf6463b98d79a6d419850facc3c9187424a1 Mon Sep 17 00:00:00 2001 From: Tom Ridge Date: Sat, 16 Nov 2013 02:52:36 +0200 Subject: [PATCH 275/760] HOL: update to k.8 --- .../science/logic/hol/default.nix | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 2e1647b6c71d..52a3129fec0a 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, - experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: let pname = "hol4"; @@ -16,18 +15,9 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz fontconfig liberation_ttf]; + buildInputs = [polyml graphviz]; buildCommand = '' - - mkdir chroot-fontconfig - cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf - sed -e 's@@@' -i chroot-fontconfig/fonts.conf - echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf - echo "" >> chroot-fontconfig/fonts.conf - - export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf - mkdir -p "$out/src" cd "$out/src" @@ -38,19 +28,16 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - for f in tools/buildutils.sml help/src-sml/DOT; - do - substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" - done + substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" #sed -ie "/compute/,999 d" tools/build-sequence # for testing poly < tools/smart-configure.sml - + bin/build ${kernelFlag} -symlink mkdir -p "$out/bin" - ln -st $out/bin "$out/src/${holsubdir}/bin/"* + ln -st $out/bin $out/src/${holsubdir}/bin/* # ln -s $out/src/hol4.${version}/bin $out/bin ''; From 6c32416a31c3cc1dd7069ec12d4bcd1f6e1159c9 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 16 Nov 2013 03:43:38 +0200 Subject: [PATCH 276/760] Fix HOL documentation build --- .../science/logic/hol/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 52a3129fec0a..dc8e975ce1d1 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, + experimentalKernel ? true}: let pname = "hol4"; @@ -15,9 +16,18 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz]; + buildInputs = [polyml graphviz fontconfig liberation_ttf]; buildCommand = '' + + mkdir chroot-fontconfig + cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf + sed -e 's@@@' -i chroot-fontconfig/fonts.conf + echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf + echo "" >> chroot-fontconfig/fonts.conf + + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf + mkdir -p "$out/src" cd "$out/src" @@ -28,7 +38,10 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" + for f in tools/buildutils.sml help/src-sml/DOT; + do + substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" + done #sed -ie "/compute/,999 d" tools/build-sequence # for testing From 17fd8d562755611e9dab408f37ebd6cd51189f61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Nov 2013 12:33:39 +0100 Subject: [PATCH 277/760] haskell-system-posix-redirect: update to version 1.1.0.1 --- .../libraries/haskell/system-posix-redirect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix index b8a65e41fd8e..b0ccd4b4d848 100644 --- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "system-posix-redirect"; - version = "1.1"; - sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr"; + version = "1.1.0.1"; + sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk"; meta = { - description = "A toy module that allows you to temporarily redirect a program's stdout"; + description = "A toy module to temporarily redirect a program's stdout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 188834603a306fd70be497feaa83c94e145e1fdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Nov 2013 12:33:40 +0100 Subject: [PATCH 278/760] haskell-shake: update to version 0.10.9 --- .../libraries/haskell/shake/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index ef7a6d699050..5f7640320f65 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,11 +1,11 @@ -{ cabal, binary, deepseq, filepath, hashable, random, time -, transformers, unorderedContainers, utf8String +{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random +, time, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.8"; - sha256 = "15r392b18nis9p0ys95kbj79hki19wid2gyrpy0z9zm2l5d1m3ya"; + version = "0.10.9"; + sha256 = "08czcf0pkchq558kjkfpz7vf5pn1dbqk8mb9fnivnphy963sf6sr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,12 +13,11 @@ cabal.mkDerivation (self: { unorderedContainers utf8String ]; testDepends = [ - binary deepseq filepath hashable random time transformers - unorderedContainers utf8String + binary deepseq filepath hashable QuickCheck random time + transformers unorderedContainers utf8String ]; - doCheck = false; meta = { - homepage = "http://community.haskell.org/~ndm/shake/"; + homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 9cfc81b749affa9dccacc93b5545f8d73cf447eb Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:06:30 +0200 Subject: [PATCH 279/760] clang: Build with gcc 4.7 for better libstdc++. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aab9415294d0..56b66872749e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2226,7 +2226,7 @@ let clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { stdenv = if stdenv.isDarwin then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; + else stdenvAdapters.overrideGCC stdenv gcc47; }; clang = wrapClang clangUnwrapped; From 52abed95cad887838e75c3531b6fbb785dd0ef59 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:05:53 +0200 Subject: [PATCH 280/760] all-packages: Add a self-hosted variant of clang. --- pkgs/top-level/all-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b66872749e..d6ba3eba9874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,8 +2231,26 @@ let clang = wrapClang clangUnwrapped; + libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; }; + clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { + stdenv = libcxxStdenv; + llvm = libcxxLLVM; + }); + + clangWrapSelf = build: (import ../build-support/clang-wrapper) { + clang = build; + stdenv = clangStdenv; + libc = glibc; + binutils = binutils_gold; + shell = bash; + inherit libcxx coreutils zlib; + nativeTools = false; + nativeLibc = false; + }; + #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); clean = callPackage ../development/compilers/clean { }; From 2c9f0e059ab5cf7acc4769f1dfd8cf1a4e3c3663 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:04:31 +0200 Subject: [PATCH 281/760] clang: Do not try to build clang-tblgen in LLVM's build path. --- pkgs/development/compilers/llvm/clang-tablegen-dir.patch | 9 +++++++++ pkgs/development/compilers/llvm/clang.nix | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/clang-tablegen-dir.patch diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch new file mode 100644 index 000000000000..de6a468b239f --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch @@ -0,0 +1,9 @@ +--- a/utils/TableGen/CMakeLists.txt (revision 190146) ++++ b/utils/TableGen/CMakeLists.txt (working copy) +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS Support) ++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + + add_tablegen(clang-tblgen CLANG + ClangASTNodesEmitter.cpp + diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index df58591973e6..8c178c9ce037 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake libxml2 python ]; - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + patches = [ ./clang-tablegen-dir.patch ] ++ + stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" From e3f2e2e10b8cf2065800358a90ef04ea41e708eb Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:03:26 +0200 Subject: [PATCH 282/760] libcxx: Update to 190100 and build with libc++abi. --- pkgs/development/libraries/libc++/default.nix | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index bed953119151..1d4ef158113a 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,19 +1,43 @@ -{ stdenv, fetchsvn, cmake }: +{ stdenv, fetchsvn, cmake, libunwind }: -let rev = "165151"; in +let rev = "190100"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libc++-pre${rev}"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; inherit rev; - sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz"; + sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03"; + }; + + cxxabi = fetchsvn { + url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk"; + inherit rev; + sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp"; }; buildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + preConfigure = '' + sed -i 's/;cxa_demangle.h//' CMakeLists.txt + cp -R ${cxxabi} cxxabi + chmod u+w -R cxxabi # umm + (export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include"; + export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + cd cxxabi/lib + sed -e s,-lstdc++,, -i buildit # do not link to libstdc++! + ./buildit + mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib + cd $out/lib + ln -s libc++abi.so.1.0 libc++abi.so + ln -s libc++abi.so.1.0 libc++abi.so.1) + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include" + "-DLIBCXX_CXX_ABI=libcxxabi" ]; + buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make''; enableParallelBuilding = true; From 7c3f07f97c476111e36469a72fe91eb87942d2ac Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:02:50 +0200 Subject: [PATCH 283/760] clang-wrapper: Guard against LD_LIBRARY_PATH. --- pkgs/build-support/clang-wrapper/clang-wrapper.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 2052d2c2eb4c..4f710856868b 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -134,6 +134,12 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then source "$NIX_CLANG_WRAPPER_EXEC_HOOK" fi +# We nuke LD_LIBRARY_PATH here, because clang dynamically links to LLVM. +# Unfortunately, when such clang is used to build LLVM again, it can get in +# trouble temporarily binding to the build-directory versions of the libraries +# (the buildsystem sets LD_LIBRARY_PATH). That is very undesirable and can +# cause mysterious failures. +LD_LIBRARY_PATH= # Call the real `clang'. Filter out warnings from stderr about unused # `-B' flags, since they confuse some programs. Deep bash magic to From dde70f937826f5a3545a6e52eed8303740237abf Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 7 Sep 2013 11:02:32 +0200 Subject: [PATCH 284/760] clang-wrapper: Optionally use libc++ instead of libstdc++. --- pkgs/build-support/clang-wrapper/builder.sh | 3 +++ pkgs/build-support/clang-wrapper/clang-wrapper.sh | 5 ++++- pkgs/build-support/clang-wrapper/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index 9f1542e04113..3f90b9d32bd0 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -58,11 +58,14 @@ fi doSubstitute() { local src=$1 local dst=$2 + local uselibcxx= + if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi # Can't use substitute() here, because replace may not have been # built yet (in the bootstrap). sed \ -e "s^@out@^$out^g" \ -e "s^@shell@^$shell^g" \ + -e "s^@libcxx@^$uselibcxx^g" \ -e "s^@clang@^$clang^g" \ -e "s^@clangProg@^$clangProg^g" \ -e "s^@binutils@^$binutils^g" \ diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 4f710856868b..84067844cad8 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -52,7 +52,6 @@ if test "$nonFlagArgs" = "0"; then dontLink=1 fi - # Optionally filter out paths not refering to the store. params=("$@") if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then @@ -79,6 +78,10 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then params=("${rest[@]}") fi +if test -n "@libcxx@"; then + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" + NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -lc++abi" +fi # Add the flags for the C compiler proper. extraAfter=($NIX_CFLAGS_COMPILE) diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 9f560d0d2fba..1b2a02fa86a4 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -7,7 +7,7 @@ { name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" , clang ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" -, zlib ? null +, zlib ? null, libcxx ? null }: assert nativeTools -> nativePrefix != ""; @@ -33,7 +33,7 @@ stdenv.mkDerivation { utils = ./utils.sh; addFlags = ./add-flags; - inherit nativeTools nativeLibc nativePrefix clang clangVersion; + inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; gcc = clang.gcc; libc = if nativeLibc then null else libc; binutils = if nativeTools then null else binutils; From e0171ef0267c13e4a9d8888013a08b6ae0d19406 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 15 Nov 2013 21:56:45 +0100 Subject: [PATCH 285/760] systemd: Change services.logind.extraConfig type to types.lines --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7c6807340fd3..a21280414342 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -518,7 +518,7 @@ in services.logind.extraConfig = mkOption { default = ""; - type = types.str; + type = types.lines; example = "HandleLidSwitch=ignore"; description = '' Extra config options for systemd-logind. See man logind.conf for From 36a05c7b1583e4611fa824e1c05d94462dcbc3c2 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 15 Nov 2013 19:49:01 +0100 Subject: [PATCH 286/760] systemd: Add systemd.extraConfig option for /etc/systemd/system.conf --- nixos/modules/system/boot/systemd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a21280414342..8895f9bf727f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -486,6 +486,16 @@ in ''; }; + systemd.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultLimitCORE=infinity"; + description = '' + Extra config options for systemd. See man systemd-system.conf for + available options. + ''; + }; + services.journald.console = mkOption { default = ""; type = types.str; @@ -555,6 +565,7 @@ in environment.etc."systemd/system.conf".text = '' [Manager] + ${config.systemd.extraConfig} ''; environment.etc."systemd/journald.conf".text = From d8b0c942a1ec2101e0b74044aea01c9b281dce03 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 12 Nov 2013 15:37:49 +0400 Subject: [PATCH 287/760] xfce: enable tumbler the thumbnail manager (close #1206) --- .../services/x11/desktop-managers/xfce.nix | 1 + pkgs/desktops/xfce/core/tumbler.nix | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 8199829ef90f..d20010c70a61 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -72,6 +72,7 @@ in pkgs.xfce.thunar_volman pkgs.xfce.gvfs pkgs.xfce.xfce4_appfinder + pkgs.xfce.tumbler ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 1e7c3c5127e7..06902792624e 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype, +libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; @@ -11,11 +12,24 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf ]; + buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype + poppler libgsf bzip2]; + + configureFlags = [ + # Needs gst-tag + # "--enable-gstreamer-thumbnailer" + + # Needs libffmpegthumbnailer + # "--enable-ffmpeg-thumbnailer" + + "--enable-odf-thumbnailer" + "--enable-poppler-thumbnailer" + ]; meta = { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; + platforms = stdenv.lib.platforms.linux; license = "GPLv2"; }; } From db3abf1c45e4fbb1b41f6666d0b954249202c9c2 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Fri, 15 Nov 2013 17:50:59 +0100 Subject: [PATCH 288/760] nanomsg: new package Socket library built in C but provides bindings in many languages. Highly efficient and easy to use. [@bjornfor: whitespace fixes, quote shell variables and add meta.platforms] --- .../development/libraries/nanomsg/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/nanomsg/default.nix diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix new file mode 100644 index 000000000000..8bf7ccbfcfa6 --- /dev/null +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.2-alpha"; + name = "nanomsg-${version}"; + + src = fetchurl { + url = "http://download.nanomsg.org/${name}.tar.gz"; + sha256 = "0bgjj1x1a991pckw4nm5bkmbibjsf74y0ns23fpk4jj5dwarhm3d"; + }; + + installPhase = '' + mkdir -p "$out" + make install PREFIX="$out" + ''; + + meta = with stdenv.lib; { + description= "Socket library that provides several common communication patterns"; + homepage = http://nanomsg.org/; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6ba3eba9874..9a4a085ead35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5257,6 +5257,8 @@ let mythes = callPackage ../development/libraries/mythes { }; + nanomsg = callPackage ../development/libraries/nanomsg { }; + ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) { inherit fetchurl; unicode = system != "i686-cygwin"; From 0eeb78d74c470b2d781ca46427e2614ae4313da5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 13 Nov 2013 05:58:15 -0600 Subject: [PATCH 289/760] nvidia: Update to version 331.20 We no longer need the patches applied for the previous version so they are removed. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++----- ...vidia-drivers-linux-3.11-incremental.patch | 25 ------------------- .../linux/nvidia-x11/version-test.patch | 19 -------------- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/version-test.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f9239bb5fba1..02eb65123d80 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - versionNumber = "319.60"; + versionNumber = "331.20"; in @@ -19,20 +19,16 @@ stdenv.mkDerivation { builder = ./builder.sh; - patches = - [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.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 = "0kjidkwd2b5aik74663mxk3ffq4a3fmaybq2aq1lcbfhvvh49j6j"; + sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks"; } 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 = "0fhrxcfsw2jaycnz9gr04c9w585wydx8kpm6rjjbw19wkf8hlq3z"; + sha256 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch deleted file mode 100644 index bb6fad932e3c..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/nvidia-drivers-linux-3.11-incremental.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 -From: Lukas Elsner -Date: Wed, 17 Jul 2013 01:16:04 +0200 -Subject: [PATCH] replace num_physpages with totalram_pages - ---- - kernel/nv-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h -index 4e5ed89..46c51ec 100644 ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) - #endif - - #if !defined(NV_VMWARE) --#define NV_NUM_PHYSPAGES num_physpages -+#define NV_NUM_PHYSPAGES totalram_pages - #define NV_GET_CURRENT_PROCESS() current->tgid - #define NV_IN_ATOMIC() in_atomic() - #define NV_LOCAL_BH_DISABLE() local_bh_disable() --- -1.8.3.2 - diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch deleted file mode 100644 index 9b6908ee5c0a..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/version-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh ---- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430 -+++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430 -@@ -1699,11 +1699,13 @@ - # kernel older than 2.6.6, that's all we require to - # build the module. - # -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \ -+ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \ -+ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi From ee5d4614716db137fcc2088d913c58f8f68126bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Nov 2013 23:23:04 +0100 Subject: [PATCH 290/760] Date::Manip: Update to 6.41 --- pkgs/top-level/perl-packages.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6fff03c8b51a..05a6aec35a22 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1925,10 +1925,14 @@ rec { }; DateManip = buildPerlPackage { - name = "DateManip-5.54"; + name = "Date-Manip-6.41"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz; - sha256 = "0ap2jgqx7yvjsyph9zsvadsih41cj991j3jwgz5261sq7q74y7xn"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.41.tar.gz; + sha256 = "f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09"; + }; + propagatedBuildInputs = [ TestInter ]; + meta = { + description = "Date manipulation routines"; }; }; @@ -8600,6 +8604,18 @@ rec { }; }; + TestInter = buildPerlPackage { + name = "Test-Inter-1.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.05.tar.gz; + sha256 = "bda95ef503f1c1b39a5cd1ea686d18a67a63b56a8eb458f0614fc2acc51f7988"; + }; + meta = { + description = "Framework for more readable interactive test scripts"; + license = "perl"; + }; + }; + TextMarkdown = buildPerlPackage rec { name = "Text-Markdown-1.0.26"; src = fetchurl { From 359e2e3addff559f711ab62b47511cf83a725c8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Nov 2013 16:56:15 +0100 Subject: [PATCH 291/760] gnucash: Enable support for Finance::Quote --- pkgs/applications/office/gnucash/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index eddaf8f33e7c..b399c80ebff9 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl +, libgsf, libart_lgpl, perlPackages }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -21,23 +21,31 @@ stdenv.mkDerivation rec { pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' - sed -i $out/bin/update-gnucash-gconf \ + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' - for prog in "$out/bin/"* + + for prog in $(echo "$out/bin/"*) do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl