From 07849e749abb46b48db7123de8b40cb40bc08724 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 13 Oct 2016 07:58:54 -0500 Subject: [PATCH 001/336] cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward. --- .../tools/build-managers/cmake/2.8.nix | 25 +++++++++++-------- .../tools/build-managers/cmake/default.nix | 17 ++++++------- .../cmake/search-path-3.2.patch | 12 ++++----- .../build-managers/cmake/search-path.patch | 12 ++++----- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index d824c3e2c96..52c577aedb3 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -5,6 +5,8 @@ with stdenv.lib; assert wantPS -> (ps != null); +assert stdenv ? cc; +assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; @@ -31,9 +33,8 @@ stdenv.mkDerivation rec { url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path.patch ++ + # Don't search in non-Nix locations such as /usr, but do search in our libc. + [ ./search-path.patch ] ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" @@ -50,22 +51,24 @@ stdenv.mkDerivation rec { CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); - configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive" - + stdenv.lib.optionalString useQt4 " --qt-gui"; + configureFlags = [ + "--docdir=/share/doc/${name}" + "--mandir=/share/man" + "--system-libs" + "--no-system-libarchive" + ] ++ stdenv.lib.optional useQt4 "--qt-gui"; setupHook = ./setup-hook.sh; dontUseCmakeConfigure = true; - preConfigure = with stdenv; optionalString (stdenv ? glibc) - '' + preConfigure = with stdenv; '' source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${getBin glibc} \ - --subst-var-by glibc_dev ${getDev glibc} \ - --subst-var-by glibc_lib ${getLib glibc} + --subst-var-by libc_bin ${getBin cc.libc} \ + --subst-var-by libc_dev ${getDev cc.libc} \ + --subst-var-by libc_lib ${getLib cc.libc} ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 52822178c02..012ece041b2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; assert wantPS -> (ps != null); +assert stdenv ? cc; +assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; @@ -25,10 +27,8 @@ stdenv.mkDerivation rec { sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx"; }; - patches = - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.2.patch + # Don't search in non-Nix locations such as /usr, but do search in our libc. + patches = [ ./search-path-3.2.patch ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; @@ -43,13 +43,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - preConfigure = with stdenv; optionalString (stdenv ? glibc) - '' + preConfigure = with stdenv; '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${getBin glibc} \ - --subst-var-by glibc_dev ${getDev glibc} \ - --subst-var-by glibc_lib ${getLib glibc} + --subst-var-by libc_bin ${getBin cc.libc} \ + --subst-var-by libc_dev ${getDev cc.libc} \ + --subst-var-by libc_lib ${getLib cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} ''; diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index b61982efb9a..ba7438d2c0f 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -25,7 +25,7 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -+ @glibc_dev@/include ++ @libc_dev@/include ) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH @@ -39,26 +39,26 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ @glibc_bin@/bin ++ @libc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 6d6ca74ccad..9fc94966168 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -53,7 +53,7 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_SYSTEM_LIBRARY_PATH @@ -67,26 +67,26 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ @glibc_bin@/bin ++ @libc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) # Enable use of lib64 search path variants by default. From 48d7c7751a4a320a8bc68a54f9c528aa9bea1482 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 13 Oct 2016 08:07:58 -0500 Subject: [PATCH 002/336] cmake: bootstrap in parallel Builds on previous commit so this happens without needing stdenv.glibc. --- pkgs/development/tools/build-managers/cmake/2.8.nix | 1 + pkgs/development/tools/build-managers/cmake/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 52c577aedb3..a197c69edff 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { --subst-var-by libc_bin ${getBin cc.libc} \ --subst-var-by libc_dev ${getDev cc.libc} \ --subst-var-by libc_lib ${getLib cc.libc} + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 012ece041b2..9cc8d987570 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${getLib cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; configureFlags = [ "--docdir=share/doc/${name}" From e35ddbec13a2b7d081fd83a2e4d1d286bd43ac41 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 23 Oct 2016 00:51:29 -0400 Subject: [PATCH 003/336] fltk: fix on darwin Compiling Fl_cocoa.mm... Fl_cocoa.mm:4079:30: error: use of undeclared identifier 'version'; did you mean 'Fl::version'? NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; ^~~~~~~ Fl::version ../FL/Fl.H:262:17: note: 'Fl::version' declared here static double version(); ^ Fl_cocoa.mm:4079:5: error: use of undeclared identifier 'NSOperatingSystemVersion' NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; ^ Fl_cocoa.mm:4080:9: error: use of undeclared identifier 'version' M = version.majorVersion; ^ Fl_cocoa.mm:4081:9: error: use of undeclared identifier 'version' m = version.minorVersion; ^ Fl_cocoa.mm:4082:9: error: use of undeclared identifier 'version' b = version.patchVersion; ^ 5 errors generated. --- pkgs/development/libraries/fltk/default.nix | 2 ++ pkgs/development/libraries/fltk/nsosv.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/fltk/nsosv.patch diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 99cb8aae323..6f906d52502 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -21,6 +21,8 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin diff --git a/pkgs/development/libraries/fltk/nsosv.patch b/pkgs/development/libraries/fltk/nsosv.patch new file mode 100644 index 00000000000..9e55b011b57 --- /dev/null +++ b/pkgs/development/libraries/fltk/nsosv.patch @@ -0,0 +1,20 @@ +diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm +index 6f5b8b1..2c7763d 100644 +--- a/src/Fl_cocoa.mm ++++ b/src/Fl_cocoa.mm +@@ -4074,15 +4074,6 @@ Window fl_xid(const Fl_Window* w) + static int calc_mac_os_version() { + int M, m, b = 0; + NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init]; +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 +- if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) { +- NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; +- M = version.majorVersion; +- m = version.minorVersion; +- b = version.patchVersion; +- } +- else +-#endif + { + NSDictionary * sv = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]; + const char *s = [[sv objectForKey:@"ProductVersion"] UTF8String]; From a8eb57d953be65b86d1ba2cb583de513f4ac0a4b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 23 Oct 2016 01:53:10 -0400 Subject: [PATCH 004/336] openblas: silence warnings on darwin Without this one gets a lot of build time warnings like: ld: warning: object file (/tmp/strip.2OzFn8) was built for newer OSX version (10.9) than being linked (10.7) --- pkgs/development/libraries/science/math/openblas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0cc79f6b44b..3893875a234 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { makeFlags = (if local then localFlags else genericFlags) ++ - optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] + optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.7"] ++ [ "FC=gfortran" From f9b2f9bb92866511c456f3c70b342b0c4cdff621 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 23 Oct 2016 20:52:36 -0400 Subject: [PATCH 005/336] octave: use openblasCompat on darwin --- 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 3d6a5631a27..c3a2100e4f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5477,7 +5477,7 @@ in glpk = null; suitesparse = null; jdk = null; - openblas = openblas; + openblas = if stdenv.isDarwin then openblasCompat else openblas; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { qt = qt4; From 5994c12470205a265aa04280fa9f26465cb67590 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 23 Oct 2016 20:54:18 -0400 Subject: [PATCH 006/336] octave: mesa and libX11 are not used on darwin --- pkgs/development/interpreters/octave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 3389620cdd9..df443cdc3e1 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym"; }; - buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile - fftw fftwSinglePrec qrupdate arpack libwebp ] + buildInputs = [ gfortran readline ncurses perl flex texinfo qhull + graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw + fftwSinglePrec qrupdate arpack libwebp ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ; doCheck = !stdenv.isDarwin; From 237c15d883d6f515b6829835167cf3c9f564e2ec Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 25 Oct 2016 22:55:25 +0800 Subject: [PATCH 007/336] netdata: allow UI to load when running as non-root --- pkgs/tools/system/netdata/default.nix | 3 +++ pkgs/tools/system/netdata/web_access.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/system/netdata/web_access.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 13c50fe3ec9..30d9d6b4ef3 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec{ buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; + # Allow UI to load when running as non-root + patches = [ ./web_access.patch ]; + preConfigure = '' export ZLIB_CFLAGS=" " export ZLIB_LIBS="-lz" diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch new file mode 100644 index 00000000000..f1e4bd64cbb --- /dev/null +++ b/pkgs/tools/system/netdata/web_access.patch @@ -0,0 +1,20 @@ +--- a/src/web_client.c.orig ++++ b/src/web_client.c +@@ -331,7 +331,7 @@ + buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename); + return 404; + } +- ++#if 0 + // check if the file is owned by expected user + if(stat.st_uid != web_files_uid()) { + error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); +@@ -345,7 +345,7 @@ + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); + return 403; + } +- ++#endif + if((stat.st_mode & S_IFMT) == S_IFDIR) { + snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename); + return mysendfile(w, webfilename); From 8ce23cfec212ed868f81a44871ed9cbd3225523a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 25 Oct 2016 22:23:19 +0800 Subject: [PATCH 008/336] netdata: allow execution without a config file --- pkgs/tools/system/netdata/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 30d9d6b4ef3..46932076177 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,11 +16,19 @@ stdenv.mkDerivation rec{ # Allow UI to load when running as non-root patches = [ ./web_access.patch ]; - preConfigure = '' - export ZLIB_CFLAGS=" " - export ZLIB_LIBS="-lz" - export UUID_CFLAGS=" " - export UUID_LIBS="-luuid" + # Build will fail trying to create /var/{cache,lib,log}/netdata without this + postPatch = '' + sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am + ''; + + configureFlags = [ + "--localstatedir=/var" + ]; + + # App fails on runtime if the default config file is not detected + # The upstream installer does prepare an empty file too + postInstall = '' + touch $out/etc/netdata/netdata.conf ''; meta = with stdenv.lib; { From cbc25e55068eb61644deacdd4f9ff883140f064c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 27 Oct 2016 17:15:18 +0200 Subject: [PATCH 009/336] duplicity: use buildPythonApplication --- pkgs/tools/backup/duplicity/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index c63e6c515a5..4f5601501e9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -3,8 +3,7 @@ let version = "0.7.07.1"; - inherit (python2Packages) boto cffi cryptography ecdsa enum idna ipaddress lockfile paramiko pyasn1 pycrypto python setuptools six; -in stdenv.mkDerivation { +in python2Packages.buildPythonApplication { name = "duplicity-${version}"; src = fetchurl { @@ -12,16 +11,21 @@ in stdenv.mkDerivation { sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8"; }; - installPhase = '' - python setup.py install --prefix=$out + postInstall = '' wrapProgram $out/bin/duplicity \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" - wrapProgram $out/bin/rdiffdir \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; - buildInputs = [ python librsync makeWrapper setuptools ]; + buildInputs = [ librsync makeWrapper ]; + + # Inputs for tests. These are added to buildInputs when doCheck = true + checkInputs = with python2Packages; [ lockfile mock pexpect ]; + + # Many problematic tests + doCheck = false; + + propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna + ipaddress lockfile paramiko pyasn1 pycrypto six ]; meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; From bb8b48c794f8c0517b4aded06616771a84d1b518 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 29 Oct 2016 07:33:25 +0200 Subject: [PATCH 010/336] mpich: remove unused test --- nixos/tests/mpich.nix | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 nixos/tests/mpich.nix diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix deleted file mode 100644 index a28e41deb31..00000000000 --- a/nixos/tests/mpich.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Simple example to showcase distributed tests using NixOS VMs. - -import ./make-test.nix ({ pkgs, ...} : { - name = "mpich"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; - }; - - nodes = { - master = - { config, pkgs, ... }: { - environment.systemPackages = [ gcc mpich2 ]; - #boot.kernelPackages = pkgs.kernelPackages_2_6_29; - }; - - slave = - { config, pkgs, ... }: { - environment.systemPackages = [ gcc mpich2 ]; - }; - }; - - # Start master/slave MPI daemons and compile/run a program that uses both - # nodes. - testScript = - '' - startAll; - - $master->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf"); - $master->succeed("chmod 600 /etc/mpd.conf"); - $master->succeed("mpd --daemon --ifhn=master --listenport=4444"); - - $slave->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf"); - $slave->succeed("chmod 600 /etc/mpd.conf"); - $slave->succeed("mpd --daemon --host=master --port=4444"); - - $master->succeed("mpicc -o example -Wall ${./mpich-example.c}"); - $slave->succeed("mpicc -o example -Wall ${./mpich-example.c}"); - - $master->succeed("mpiexec -n 2 ./example >&2"); - ''; -}) From 31f0fdef32f014eee619ce27c0b5f44b255c311f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 29 Oct 2016 22:07:48 +0200 Subject: [PATCH 011/336] cmake: minor update 3.6.0 -> 3.6.2 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9cc8d987570..1e4bacb0725 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -13,7 +13,7 @@ assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; majorVersion = "3.6"; - minorVersion = "0"; + minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx"; + sha256 = "0imkz04ncz6cv5659qfd4scm99k3siq7zrrsa8pvp663d8mf76hq"; }; # Don't search in non-Nix locations such as /usr, but do search in our libc. From 182b1c277797a6b3ae10c752314e80e98a17d61e Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Sat, 29 Oct 2016 23:08:01 +0200 Subject: [PATCH 012/336] node-packages: update & cleanup * update packages for v4 * remove files and generation for v0_10 and v5 as nodejs-5_x and nodejs-0_10 are no longer supported --- .../node-packages/composition-v5.nix | 16 - .../node-packages/default-v0_10.nix | 33 - pkgs/development/node-packages/default-v5.nix | 44 - pkgs/development/node-packages/generate.sh | 1 - pkgs/development/node-packages/node-env.nix | 93 +- .../node-packages/node-packages-v4.nix | 5413 ++-- .../node-packages/node-packages-v5.nix | 26989 ---------------- 7 files changed, 2934 insertions(+), 29655 deletions(-) delete mode 100644 pkgs/development/node-packages/composition-v5.nix delete mode 100644 pkgs/development/node-packages/default-v0_10.nix delete mode 100644 pkgs/development/node-packages/default-v5.nix delete mode 100644 pkgs/development/node-packages/node-packages-v5.nix diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix deleted file mode 100644 index be9201677ce..00000000000 --- a/pkgs/development/node-packages/composition-v5.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.1.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages-v5.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v0_10.nix b/pkgs/development/node-packages/default-v0_10.nix deleted file mode 100644 index baaadb39160..00000000000 --- a/pkgs/development/node-packages/default-v0_10.nix +++ /dev/null @@ -1,33 +0,0 @@ -{pkgs, system, nodejs}: - -let - nodePackages = import ./composition-v4.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - }); -} diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix deleted file mode 100644 index 00dce5966aa..00000000000 --- a/pkgs/development/node-packages/default-v5.nix +++ /dev/null @@ -1,44 +0,0 @@ -{pkgs, system, nodejs}: - -let - nodePackages = import ./composition-v5.nix { - inherit pkgs system nodejs; - }; -in -nodePackages // { - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); - - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); - - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; - - preRebuild = '' - mkdir $TMPDIR/webdrvr - - ln -s ${pkgs.fetchurl { - url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; - sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; - }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar - ln -s ${pkgs.fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; - sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; - }} $TMPDIR/webdrvr/chromedriver_linux64.zip - ''; - - dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); - - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" - done - ''; - }); -} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 385463423ea..8c701771d57 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,4 +2,3 @@ rm -f node-env.nix node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix -node2nix -5 -i node-packages.json -o node-packages-v5.nix -c composition-v5.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 2a04b3dfba8..c5c69c7d05d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -6,19 +6,19 @@ let # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin - + cat > $out/bin/tar < package.json < Date: Sun, 30 Oct 2016 09:54:55 +0100 Subject: [PATCH 013/336] node-packages: add packages for v6 --- .../node-packages/composition-v6.nix | 16 + pkgs/development/node-packages/generate.sh | 2 + .../node-packages/node-packages-v6.nix | 27255 ++++++++++++++++ 3 files changed, 27273 insertions(+) create mode 100644 pkgs/development/node-packages/composition-v6.nix create mode 100644 pkgs/development/node-packages/node-packages-v6.nix diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix new file mode 100644 index 00000000000..289a8ab1201 --- /dev/null +++ b/pkgs/development/node-packages/composition-v6.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.1.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages-v6.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 8c701771d57..613293e850b 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,3 +2,5 @@ rm -f node-env.nix node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix +# node2nix doesn't explicitely support node v6 so far +node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix new file mode 100644 index 00000000000..b2202168ef6 --- /dev/null +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -0,0 +1,27255 @@ +# This file has been generated by node2nix 1.1.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "colors-0.6.0-1" = { + name = "colors"; + packageName = "colors"; + version = "0.6.0-1"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; + sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; + }; + }; + "ejs-2.3.4" = { + name = "ejs"; + packageName = "ejs"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"; + sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; + }; + }; + "pkginfo-0.2.2" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; + sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "wrench-1.3.9" = { + name = "wrench"; + packageName = "wrench"; + version = "1.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; + sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; + }; + }; + "xmldom-0.1.19" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; + }; + }; + "jsonlint-1.5.1" = { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.5.1.tgz"; + sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; + }; + }; + "uglify-js-2.4.15" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "global-paths-0.1.2" = { + name = "global-paths"; + packageName = "global-paths"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; + sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + }; + }; + "source-map-0.1.9" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; + sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + }; + }; + "xml2tss-0.0.5" = { + name = "xml2tss"; + packageName = "xml2tss"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; + sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + }; + }; + "moment-2.10.6" = { + name = "moment"; + packageName = "moment"; + version = "2.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"; + sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77"; + }; + }; + "node.extend-1.0.10" = { + name = "node.extend"; + packageName = "node.extend"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.10.tgz"; + sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; + }; + }; + "nomnom-1.8.1" = { + name = "nomnom"; + packageName = "nomnom"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; + sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; + }; + }; + "JSV-4.0.2" = { + name = "JSV"; + packageName = "JSV"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; + sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; + }; + }; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + }; + "chalk-0.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; + }; + }; + "has-color-0.1.7" = { + name = "has-color"; + packageName = "has-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; + }; + }; + "ansi-styles-1.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }; + }; + "strip-ansi-0.1.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "source-map-0.1.34" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.34"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; + sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; + }; + }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "amdefine-1.0.0" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; + sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "array-unique-0.2.1" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; + sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + }; + }; + "global-modules-0.2.3" = { + name = "global-modules"; + packageName = "global-modules"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; + sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; + }; + }; + "is-windows-0.1.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz"; + sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; + }; + }; + "global-prefix-0.1.4" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz"; + sha1 = "05158db1cde2dd491b455e290eb3ab8bfc45c6e1"; + }; + }; + "is-windows-0.2.0" = { + name = "is-windows"; + packageName = "is-windows"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz"; + sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c"; + }; + }; + "ini-1.3.4" = { + name = "ini"; + packageName = "ini"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + }; + "osenv-0.1.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"; + sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; + }; + }; + "which-1.2.11" = { + name = "which"; + packageName = "which"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + }; + }; + "xml2js-0.2.8" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + }; + }; + "sax-0.5.8" = { + name = "sax"; + packageName = "sax"; + version = "0.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + }; + }; + "is-0.3.0" = { + name = "is"; + packageName = "is"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; + sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + }; + }; + "adal-node-0.1.21" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.21"; + src = fetchurl { + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; + sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; + }; + }; + "async-1.4.2" = { + name = "async"; + packageName = "async"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; + sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; + }; + }; + "azure-common-0.9.18" = { + name = "azure-common"; + packageName = "azure-common"; + version = "0.9.18"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; + }; + }; + "azure-arm-authorization-2.0.0" = { + name = "azure-arm-authorization"; + packageName = "azure-arm-authorization"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; + sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; + }; + }; + "azure-arm-cdn-0.2.1" = { + name = "azure-arm-cdn"; + packageName = "azure-arm-cdn"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-0.2.1.tgz"; + sha1 = "afccda7d6e46632bf3e4016e573e2da1c8874b3a"; + }; + }; + "azure-arm-commerce-0.1.1" = { + name = "azure-arm-commerce"; + packageName = "azure-arm-commerce"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz"; + sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59"; + }; + }; + "azure-arm-compute-0.19.0" = { + name = "azure-arm-compute"; + packageName = "azure-arm-compute"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.0.tgz"; + sha1 = "7dce93299d8f25f9fa689323b11565f9c774c83e"; + }; + }; + "azure-arm-hdinsight-0.2.0" = { + name = "azure-arm-hdinsight"; + packageName = "azure-arm-hdinsight"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.0.tgz"; + sha1 = "13d2cff9110485970bf063c7411eefe148e3790f"; + }; + }; + "azure-arm-hdinsight-jobs-0.1.0" = { + name = "azure-arm-hdinsight-jobs"; + packageName = "azure-arm-hdinsight-jobs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz"; + sha1 = "252938f18d4341adf9942261656e791490c3c220"; + }; + }; + "azure-arm-insights-0.11.3" = { + name = "azure-arm-insights"; + packageName = "azure-arm-insights"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz"; + sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; + }; + }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; + "azure-arm-servermanagement-0.1.2" = { + name = "azure-arm-servermanagement"; + packageName = "azure-arm-servermanagement"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; + sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; + }; + }; + "azure-arm-network-0.17.0" = { + name = "azure-arm-network"; + packageName = "azure-arm-network"; + version = "0.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; + sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; + }; + }; + "azure-arm-powerbiembedded-0.1.0" = { + name = "azure-arm-powerbiembedded"; + packageName = "azure-arm-powerbiembedded"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz"; + sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; + }; + }; + "azure-arm-trafficmanager-0.10.5" = { + name = "azure-arm-trafficmanager"; + packageName = "azure-arm-trafficmanager"; + version = "0.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; + sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; + }; + }; + "azure-arm-dns-0.11.1" = { + name = "azure-arm-dns"; + packageName = "azure-arm-dns"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; + }; + }; + "azure-arm-website-0.11.4" = { + name = "azure-arm-website"; + packageName = "azure-arm-website"; + version = "0.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; + sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; + }; + }; + "azure-arm-rediscache-0.2.1" = { + name = "azure-arm-rediscache"; + packageName = "azure-arm-rediscache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; + sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; + }; + }; + "azure-arm-datalake-analytics-0.4.3" = { + name = "azure-arm-datalake-analytics"; + packageName = "azure-arm-datalake-analytics"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.4.3.tgz"; + sha1 = "10c81e59d3064289a42ab37fea805a334333ed91"; + }; + }; + "azure-arm-datalake-store-0.4.2" = { + name = "azure-arm-datalake-store"; + packageName = "azure-arm-datalake-store"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.4.2.tgz"; + sha1 = "479f4a28986c9737b8fef14090c0c7ccc33cb123"; + }; + }; + "azure-arm-devtestlabs-0.1.0" = { + name = "azure-arm-devtestlabs"; + packageName = "azure-arm-devtestlabs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; + sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; + }; + }; + "azure-graph-1.1.1" = { + name = "azure-graph"; + packageName = "azure-graph"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; + sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; + }; + }; + "azure-gallery-2.0.0-pre.18" = { + name = "azure-gallery"; + packageName = "azure-gallery"; + version = "2.0.0-pre.18"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; + sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; + }; + }; + "azure-keyvault-0.11.0" = { + name = "azure-keyvault"; + packageName = "azure-keyvault"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; + sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; + }; + }; + "azure-asm-compute-0.17.0" = { + name = "azure-asm-compute"; + packageName = "azure-asm-compute"; + version = "0.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.17.0.tgz"; + sha1 = "15967b535c06a5d06330b3d5adbf5b4b85e9df90"; + }; + }; + "azure-asm-hdinsight-0.10.2" = { + name = "azure-asm-hdinsight"; + packageName = "azure-asm-hdinsight"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz"; + sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0"; + }; + }; + "azure-asm-trafficmanager-0.10.3" = { + name = "azure-asm-trafficmanager"; + packageName = "azure-asm-trafficmanager"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; + sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; + }; + }; + "azure-asm-mgmt-0.10.1" = { + name = "azure-asm-mgmt"; + packageName = "azure-asm-mgmt"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz"; + sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751"; + }; + }; + "azure-monitoring-0.10.2" = { + name = "azure-monitoring"; + packageName = "azure-monitoring"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; + sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; + }; + }; + "azure-asm-network-0.13.0" = { + name = "azure-asm-network"; + packageName = "azure-asm-network"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; + }; + }; + "azure-arm-resource-1.4.5-preview" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "1.4.5-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.5-preview.tgz"; + sha1 = "166934783752607e9a4128ea0ad715b9b7a9015f"; + }; + }; + "azure-arm-storage-0.13.1-preview" = { + name = "azure-arm-storage"; + packageName = "azure-arm-storage"; + version = "0.13.1-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.13.1-preview.tgz"; + sha1 = "9342515a44e632c48f1d0d9c7a98214ed563d8f7"; + }; + }; + "azure-asm-sb-0.10.1" = { + name = "azure-asm-sb"; + packageName = "azure-asm-sb"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz"; + sha1 = "92487b24166041119714f66760ec1f36e8dc7222"; + }; + }; + "azure-asm-sql-0.10.1" = { + name = "azure-asm-sql"; + packageName = "azure-asm-sql"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz"; + sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42"; + }; + }; + "azure-asm-storage-0.12.0" = { + name = "azure-asm-storage"; + packageName = "azure-asm-storage"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz"; + sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3"; + }; + }; + "azure-asm-subscription-0.10.1" = { + name = "azure-asm-subscription"; + packageName = "azure-asm-subscription"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; + sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; + }; + }; + "azure-asm-website-0.10.4" = { + name = "azure-asm-website"; + packageName = "azure-asm-website"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz"; + sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; + }; + }; + "azure-storage-1.3.0" = { + name = "azure-storage"; + packageName = "azure-storage"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; + sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; + }; + }; + "azure-arm-batch-0.3.0" = { + name = "azure-arm-batch"; + packageName = "azure-arm-batch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; + sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; + }; + }; + "azure-batch-0.5.2" = { + name = "azure-batch"; + packageName = "azure-batch"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + }; + }; + "azure-servicefabric-0.1.4" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; + sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; + }; + }; + "applicationinsights-0.15.12" = { + name = "applicationinsights"; + packageName = "applicationinsights"; + version = "0.15.12"; + src = fetchurl { + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.15.12.tgz"; + sha1 = "d03f282da9424f33729eb7da8279e8e8a20dc7fc"; + }; + }; + "caller-id-0.1.0" = { + name = "caller-id"; + packageName = "caller-id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz"; + sha1 = "59bdac0893d12c3871408279231f97458364f07b"; + }; + }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + }; + "commander-1.0.4" = { + name = "commander"; + packageName = "commander"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; + sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; + }; + }; + "easy-table-0.0.1" = { + name = "easy-table"; + packageName = "easy-table"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz"; + sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb"; + }; + }; + "event-stream-3.1.5" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; + sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; + }; + }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; + "github-0.1.6" = { + name = "github"; + packageName = "github"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz"; + sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; + }; + }; + "fast-json-patch-0.5.6" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; + sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; + }; + }; + "js2xmlparser-1.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; + sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; + }; + }; + "jsonlint-1.6.2" = { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + }; + }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; + "jsrsasign-4.8.2" = { + name = "jsrsasign"; + packageName = "jsrsasign"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz"; + sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; + }; + }; + "kuduscript-1.0.9" = { + name = "kuduscript"; + packageName = "kuduscript"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz"; + sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a"; + }; + }; + "moment-2.15.2" = { + name = "moment"; + packageName = "moment"; + version = "2.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"; + sha1 = "1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"; + }; + }; + "ms-rest-1.15.2" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.2.tgz"; + sha1 = "882f7d22bd2360505f03b0cbfdd19a8f71e012ff"; + }; + }; + "ms-rest-azure-1.15.2" = { + name = "ms-rest-azure"; + packageName = "ms-rest-azure"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.2.tgz"; + sha1 = "8375437c2199d8d4bc001d2308b5fc1c1fcf3d83"; + }; + }; + "node-forge-0.6.23" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.6.23"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; + sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; + }; + }; + "node-uuid-1.2.0" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; + sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; + }; + }; + "omelette-0.1.0" = { + name = "omelette"; + packageName = "omelette"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz"; + sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8"; + }; + }; + "openssl-wrapper-0.2.1" = { + name = "openssl-wrapper"; + packageName = "openssl-wrapper"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; + sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; + }; + }; + "progress-1.1.8" = { + name = "progress"; + packageName = "progress"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + }; + "prompt-0.2.14" = { + name = "prompt"; + packageName = "prompt"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; + sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; + }; + }; + "readable-stream-1.0.34" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + }; + }; + "request-2.74.0" = { + name = "request"; + packageName = "request"; + version = "2.74.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + }; + }; + "ssh-key-to-pem-0.11.0" = { + name = "ssh-key-to-pem"; + packageName = "ssh-key-to-pem"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; + sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; + }; + }; + "streamline-0.10.17" = { + name = "streamline"; + packageName = "streamline"; + version = "0.10.17"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz"; + sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af"; + }; + }; + "streamline-streams-0.1.5" = { + name = "streamline-streams"; + packageName = "streamline-streams"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz"; + sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; + }; + }; + "sync-request-3.0.0" = { + name = "sync-request"; + packageName = "sync-request"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz"; + sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c"; + }; + }; + "through-2.3.4" = { + name = "through"; + packageName = "through"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz"; + sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; + }; + }; + "tunnel-0.0.2" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; + sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; + "validator-5.2.0" = { + name = "validator"; + packageName = "validator"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; + sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; + }; + }; + "winston-2.1.1" = { + name = "winston"; + packageName = "winston"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; + sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "xml2js-0.1.14" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + }; + "xmlbuilder-0.4.3" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; + sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; + }; + }; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + }; + }; + "jws-3.1.3" = { + name = "jws"; + packageName = "jws"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; + sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; + }; + }; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + }; + "xmldom-0.1.22" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; + sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; + }; + }; + "xpath.js-1.0.6" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz"; + sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; + }; + }; + "base64url-1.0.6" = { + name = "base64url"; + packageName = "base64url"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; + sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; + }; + }; + "jwa-1.1.3" = { + name = "jwa"; + packageName = "jwa"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; + sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; + }; + }; + "concat-stream-1.4.10" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; + sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; + }; + }; + "meow-2.0.0" = { + name = "meow"; + packageName = "meow"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; + sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "camelcase-keys-1.0.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; + sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; + }; + }; + "indent-string-1.2.2" = { + name = "indent-string"; + packageName = "indent-string"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; + sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "buffer-equal-constant-time-1.0.1" = { + name = "buffer-equal-constant-time"; + packageName = "buffer-equal-constant-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; + }; + }; + "ecdsa-sig-formatter-1.0.7" = { + name = "ecdsa-sig-formatter"; + packageName = "ecdsa-sig-formatter"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz"; + sha1 = "3137e976a1d6232517e2513e04e32f79bcbdf126"; + }; + }; + "base64-url-1.3.3" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; + sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + }; + }; + "xml2js-0.2.7" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; + sha1 = "1838518bb01741cae0878bab4915e494c32306af"; + }; + }; + "dateformat-1.0.2-1.2.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.2-1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; + }; + }; + "validator-3.22.2" = { + name = "validator"; + packageName = "validator"; + version = "3.22.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz"; + sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"; + }; + }; + "envconf-0.0.4" = { + name = "envconf"; + packageName = "envconf"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; + sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "sax-0.5.2" = { + name = "sax"; + packageName = "sax"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; + sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; + }; + }; + "moment-2.6.0" = { + name = "moment"; + packageName = "moment"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + }; + }; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + }; + }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; + "browserify-mime-1.2.9" = { + name = "browserify-mime"; + packageName = "browserify-mime"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; + sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; + }; + }; + "json-edm-parser-0.1.2" = { + name = "json-edm-parser"; + packageName = "json-edm-parser"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; + sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "stack-trace-0.0.9" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "from-0.1.3" = { + name = "from"; + packageName = "from"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "split-0.2.10" = { + name = "split"; + packageName = "split"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + }; + }; + "streamline-0.4.11" = { + name = "streamline"; + packageName = "streamline"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; + sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; + "uuid-2.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }; + }; + "azure-arm-resource-1.4.4-preview" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "1.4.4-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; + sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "q-0.9.7" = { + name = "q"; + packageName = "q"; + version = "0.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; + }; + }; + "pkginfo-0.4.0" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; + sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; + }; + }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "utile-0.2.1" = { + name = "utile"; + packageName = "utile"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; + }; + }; + "winston-0.8.3" = { + name = "winston"; + packageName = "winston"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "i-0.3.5" = { + name = "i"; + packageName = "i"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; + sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "glob-7.1.1" = { + name = "glob"; + packageName = "glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.5.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; + sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + }; + }; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-types-2.1.12" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; + sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "tough-cookie-2.3.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; + }; + }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "async-2.1.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + }; + }; + "lodash-4.16.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"; + sha1 = "01ce306b9bad1319f2a5528674f88297aeb70127"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "is-my-json-valid-2.15.0" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; + sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "jsonpointer-4.0.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"; + sha1 = "6661e161d2fc445f19f98430231343722e1fcbd5"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; + sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "dashdash-1.14.0" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; + sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.14.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "mime-db-1.24.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; + sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + }; + "ctype-0.5.2" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "fibers-1.0.15" = { + name = "fibers"; + packageName = "fibers"; + version = "1.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; + sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; + }; + }; + "galaxy-0.1.12" = { + name = "galaxy"; + packageName = "galaxy"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; + sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; + }; + }; + "http-response-object-1.1.0" = { + name = "http-response-object"; + packageName = "http-response-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz"; + sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3"; + }; + }; + "then-request-2.2.0" = { + name = "then-request"; + packageName = "then-request"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/then-request/-/then-request-2.2.0.tgz"; + sha1 = "6678b32fa0ca218fe569981bbd8871b594060d81"; + }; + }; + "http-basic-2.5.1" = { + name = "http-basic"; + packageName = "http-basic"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz"; + sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; + }; + }; + "promise-7.1.1" = { + name = "promise"; + packageName = "promise"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"; + sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; + }; + }; + "asap-2.0.5" = { + name = "asap"; + packageName = "asap"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + }; + }; + "async-1.0.0" = { + name = "async"; + packageName = "async"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + }; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + }; + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "argparse-1.0.4" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; + sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + }; + }; + "bower-1.7.9" = { + name = "bower"; + packageName = "bower"; + version = "1.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; + sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + }; + }; + "bower-endpoint-parser-0.2.1" = { + name = "bower-endpoint-parser"; + packageName = "bower-endpoint-parser"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz"; + sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f"; + }; + }; + "bower-json-0.6.0" = { + name = "bower-json"; + packageName = "bower-json"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bower-json/-/bower-json-0.6.0.tgz"; + sha1 = "326579b23c33e4ea828e4763c55cd81fd7650329"; + }; + }; + "bower-logger-0.2.1" = { + name = "bower-logger"; + packageName = "bower-logger"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz"; + sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; + }; + }; + "fs-extra-0.26.7" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.26.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + }; + "lodash-4.2.1" = { + name = "lodash"; + packageName = "lodash"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; + }; + }; + "promised-temp-0.1.0" = { + name = "promised-temp"; + packageName = "promised-temp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; + sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "temp-0.8.3" = { + name = "temp"; + packageName = "temp"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; + sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + }; + }; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "deep-extend-0.4.1" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"; + sha1 = "efe4113d08085f4e6f9687759810f807469e2253"; + }; + }; + "ext-name-3.0.0" = { + name = "ext-name"; + packageName = "ext-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; + sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; + }; + }; + "graceful-fs-3.0.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "3.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz"; + sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; + }; + }; + "intersect-1.0.1" = { + name = "intersect"; + packageName = "intersect"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; + sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; + }; + }; + "ends-with-0.2.0" = { + name = "ends-with"; + packageName = "ends-with"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; + sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; + }; + }; + "ext-list-2.2.0" = { + name = "ext-list"; + packageName = "ext-list"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz"; + sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "sort-keys-length-1.0.1" = { + name = "sort-keys-length"; + packageName = "sort-keys-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; + }; + }; + "got-2.9.2" = { + name = "got"; + packageName = "got"; + version = "2.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-2.9.2.tgz"; + sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee"; + }; + }; + "duplexify-3.5.0" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"; + sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604"; + }; + }; + "infinity-agent-2.0.3" = { + name = "infinity-agent"; + packageName = "infinity-agent"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + }; + "nested-error-stacks-1.0.2" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + }; + }; + "object-assign-2.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"; + sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa"; + }; + }; + "prepend-http-1.0.4" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + }; + "read-all-stream-2.2.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz"; + sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; + }; + }; + "statuses-1.3.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; + sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + }; + }; + "timed-out-2.0.0" = { + name = "timed-out"; + packageName = "timed-out"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; + sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; + }; + }; + "end-of-stream-1.0.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; + }; + }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "stream-shift-1.0.0" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + }; + }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "normalize-package-data-2.3.5" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + }; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "signal-exit-3.0.1" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + }; + }; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "validate-npm-package-license-3.0.1" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + }; + "spdx-correct-1.0.2" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + }; + "spdx-expression-parse-1.0.4" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; + sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + }; + }; + "spdx-license-ids-1.2.2" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; + sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "graceful-fs-4.1.9" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; + sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "error-ex-1.3.0" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "sort-keys-1.1.2" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "natives-1.1.0" = { + name = "natives"; + packageName = "natives"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz"; + sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; + }; + }; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + }; + "klaw-1.3.1" = { + name = "klaw"; + packageName = "klaw"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; + sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + }; + }; + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; + "JSONStream-1.2.1" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; + }; + }; + "assert-1.3.0" = { + name = "assert"; + packageName = "assert"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; + sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + }; + }; + "browser-pack-6.0.1" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz"; + sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f"; + }; + }; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + }; + }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + }; + "cached-path-relative-1.0.0" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; + sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + }; + }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "crypto-browserify-3.11.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; + sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + }; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + }; + }; + "domain-browser-1.1.7" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; + sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + }; + }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; + "insert-module-globals-7.0.1" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; + sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + }; + }; + "labeled-stream-splicer-2.0.0" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; + sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + }; + }; + "module-deps-4.0.8" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; + sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; + }; + }; + "os-browserify-0.1.2" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + }; + }; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + }; + }; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + }; + "process-0.11.9" = { + name = "process"; + packageName = "process"; + version = "0.11.9"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz"; + sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + }; + }; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + }; + }; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + }; + "stream-browserify-2.0.1" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + }; + "stream-http-2.4.1" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.1.tgz"; + sha1 = "8ee5689ae69169e8eb8edd6aeb2ca08ab47e8f59"; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + }; + "syntax-error-1.1.6" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; + sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + }; + }; + "through2-2.0.1" = { + name = "through2"; + packageName = "through2"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; + sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "vm-browserify-0.0.4" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "combine-source-map-0.7.2" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; + sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; + }; + }; + "umd-3.0.1" = { + name = "umd"; + packageName = "umd"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; + sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; + }; + }; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + }; + }; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + }; + }; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + }; + }; + "source-map-0.5.6" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + }; + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + }; + }; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + }; + }; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + }; + }; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + }; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + }; + }; + "browserify-sign-4.0.0" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; + sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + }; + }; + "create-ecdh-4.0.0" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; + sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + }; + }; + "create-hash-1.1.2" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz"; + sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad"; + }; + }; + "create-hmac-1.1.4" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"; + sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"; + }; + }; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + }; + }; + "pbkdf2-3.0.9" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"; + sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693"; + }; + }; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + }; + }; + "randombytes-2.0.3" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; + sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; + }; + }; + "browserify-aes-1.0.6" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz"; + sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a"; + }; + }; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; + }; + }; + "evp_bytestokey-1.0.0" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"; + sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53"; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; + "cipher-base-1.0.3" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; + }; + }; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + }; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + }; + }; + "bn.js-4.11.6" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; + sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "elliptic-6.3.2" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + }; + }; + "parse-asn1-5.0.0" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; + sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + }; + }; + "brorand-1.0.6" = { + name = "brorand"; + packageName = "brorand"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + }; + }; + "hash.js-1.0.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"; + sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; + }; + }; + "asn1.js-4.8.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; + sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; + }; + }; + "ripemd160-1.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"; + sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; + }; + }; + "sha.js-2.4.5" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; + sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + }; + }; + "miller-rabin-4.0.0" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"; + sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; + }; + }; + "function-bind-1.1.0" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"; + sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; + }; + }; + "is-buffer-1.1.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; + sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + }; + }; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + }; + }; + "astw-2.0.0" = { + name = "astw"; + packageName = "astw"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; + sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + }; + }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; + "stream-splicer-2.0.0" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + }; + "detective-4.3.2" = { + name = "detective"; + packageName = "detective"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; + sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; + src = fetchurl { + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + }; + }; + "json-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; + }; + }; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + }; + "array-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }; + }; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }; + }; + "array-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }; + }; + "builtin-status-codes-2.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"; + sha1 = "6f22003baacf003ccd287afe6872151fddc58579"; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "array-loop-1.0.0" = { + name = "array-loop"; + packageName = "array-loop"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; + sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; + }; + }; + "castv2-client-1.1.2" = { + name = "castv2-client"; + packageName = "castv2-client"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.2.tgz"; + sha1 = "7865eac9181cd1f419fdcee448b5793706f853ad"; + }; + }; + "chalk-1.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; + }; + }; + "chromecast-player-0.2.3" = { + name = "chromecast-player"; + packageName = "chromecast-player"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz"; + sha1 = "fe9ce69911c88096d681e4242c1902ad30787216"; + }; + }; + "debounced-seeker-1.0.0" = { + name = "debounced-seeker"; + packageName = "debounced-seeker"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; + sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; + }; + }; + "fs-extended-0.2.1" = { + name = "fs-extended"; + packageName = "fs-extended"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz"; + sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a"; + }; + }; + "got-1.2.2" = { + name = "got"; + packageName = "got"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz"; + sha1 = "d9430ba32f6a30218243884418767340aafc0400"; + }; + }; + "internal-ip-1.2.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz"; + sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; + }; + }; + "keypress-0.2.1" = { + name = "keypress"; + packageName = "keypress"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; + sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "peerflix-0.34.0" = { + name = "peerflix"; + packageName = "peerflix"; + version = "0.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz"; + sha1 = "748f7e401284bf8f2c620264d229223304199dbe"; + }; + }; + "playerui-1.2.0" = { + name = "playerui"; + packageName = "playerui"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; + sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; + }; + }; + "query-string-1.0.1" = { + name = "query-string"; + packageName = "query-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; + sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; + }; + }; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + }; + }; + "read-torrent-1.3.0" = { + name = "read-torrent"; + packageName = "read-torrent"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz"; + sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4"; + }; + }; + "router-0.6.2" = { + name = "router"; + packageName = "router"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; + sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; + }; + }; + "srt2vtt-1.3.1" = { + name = "srt2vtt"; + packageName = "srt2vtt"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz"; + sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; + }; + }; + "stream-transcoder-0.0.5" = { + name = "stream-transcoder"; + packageName = "stream-transcoder"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz"; + sha1 = "68261be4efb48840239b5791af23ee3b8bd79808"; + }; + }; + "xml2js-0.4.17" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz"; + sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; + }; + }; + "castv2-0.1.9" = { + name = "castv2"; + packageName = "castv2"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; + sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; + }; + }; + "protobufjs-3.8.2" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; + sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; + }; + }; + "bytebuffer-3.5.5" = { + name = "bytebuffer"; + packageName = "bytebuffer"; + version = "3.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; + sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; + }; + }; + "ascli-0.3.0" = { + name = "ascli"; + packageName = "ascli"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + }; + }; + "long-2.4.0" = { + name = "long"; + packageName = "long"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; + sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; + }; + }; + "bufferview-1.0.1" = { + name = "bufferview"; + packageName = "bufferview"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; + sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; + }; + }; + "colour-0.7.1" = { + name = "colour"; + packageName = "colour"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + }; + }; + "optjs-3.2.2" = { + name = "optjs"; + packageName = "optjs"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; + sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; + }; + }; + "has-ansi-1.0.3" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; + sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; + }; + }; + "strip-ansi-2.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; + sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; + }; + }; + "supports-color-1.3.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; + sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; + }; + }; + "ansi-regex-1.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; + }; + }; + "chromecast-scanner-0.5.0" = { + name = "chromecast-scanner"; + packageName = "chromecast-scanner"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz"; + sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; + }; + }; + "mutate.js-0.2.0" = { + name = "mutate.js"; + packageName = "mutate.js"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; + sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; + }; + }; + "promiscuous-0.6.0" = { + name = "promiscuous"; + packageName = "promiscuous"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; + sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; + }; + }; + "time-line-1.0.1" = { + name = "time-line"; + packageName = "time-line"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz"; + sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a"; + }; + }; + "ware-1.3.0" = { + name = "ware"; + packageName = "ware"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; + sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + }; + }; + "array-find-0.1.1" = { + name = "array-find"; + packageName = "array-find"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz"; + sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce"; + }; + }; + "multicast-dns-4.0.1" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; + sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; + }; + }; + "thunky-0.1.0" = { + name = "thunky"; + packageName = "thunky"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }; + }; + "wrap-fn-0.1.5" = { + name = "wrap-fn"; + packageName = "wrap-fn"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"; + sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845"; + }; + }; + "co-3.1.0" = { + name = "co"; + packageName = "co"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + }; + }; + "airplay-js-0.2.16" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.2.16"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz"; + sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; + }; + }; + "clivas-0.1.4" = { + name = "clivas"; + packageName = "clivas"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; + sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; + }; + }; + "inquirer-0.8.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; + sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; + }; + }; + "network-address-0.0.5" = { + name = "network-address"; + packageName = "network-address"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; + sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; + }; + }; + "numeral-1.5.3" = { + name = "numeral"; + packageName = "numeral"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz"; + sha1 = "a4c3eba68239580509f818267c77243bce43ff62"; + }; + }; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "parse-torrent-5.8.1" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "5.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.1.tgz"; + sha1 = "29452b9eae4a1b497f12e580c1cf6fa9682e5c68"; + }; + }; + "pump-0.3.5" = { + name = "pump"; + packageName = "pump"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; + sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; + }; + }; + "rc-0.4.0" = { + name = "rc"; + packageName = "rc"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; + sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; + }; + }; + "torrent-stream-1.0.3" = { + name = "torrent-stream"; + packageName = "torrent-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; + sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; + }; + }; + "windows-no-runnable-0.0.6" = { + name = "windows-no-runnable"; + packageName = "windows-no-runnable"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; + sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; + }; + }; + "mdns-js-0.5.0" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; + sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + }; + }; + "plist-2.0.1" = { + name = "plist"; + packageName = "plist"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; + sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; + }; + }; + "mdns-js-packet-0.2.0" = { + name = "mdns-js-packet"; + packageName = "mdns-js-packet"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; + sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + }; + }; + "semver-5.1.1" = { + name = "semver"; + packageName = "semver"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; + sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; + }; + }; + "qap-3.1.3" = { + name = "qap"; + packageName = "qap"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qap/-/qap-3.1.3.tgz"; + sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; + }; + }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; + "xmlbuilder-8.2.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "8.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; + sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; + }; + }; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; + }; + }; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; + "readline2-0.1.1" = { + name = "readline2"; + packageName = "readline2"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; + sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; + }; + }; + "rx-2.5.3" = { + name = "rx"; + packageName = "rx"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; + sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; + }; + }; + "mute-stream-0.0.4" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "blob-to-buffer-1.2.6" = { + name = "blob-to-buffer"; + packageName = "blob-to-buffer"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; + sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; + }; + }; + "get-stdin-5.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"; + sha1 = "122e161591e21ff4c52530305693f20e6393a398"; + }; + }; + "magnet-uri-5.1.4" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.4.tgz"; + sha1 = "225db1f8670a944db87a5fbe27e2d90350513403"; + }; + }; + "parse-torrent-file-4.0.0" = { + name = "parse-torrent-file"; + packageName = "parse-torrent-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.0.tgz"; + sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; + }; + }; + "simple-get-2.3.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.3.0.tgz"; + sha1 = "c5fdfcce1e516ad4b2ce7b7c2bd2d710502d8ac9"; + }; + }; + "thirty-two-1.0.2" = { + name = "thirty-two"; + packageName = "thirty-two"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"; + sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; + }; + }; + "uniq-1.0.1" = { + name = "uniq"; + packageName = "uniq"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + }; + "bencode-0.10.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.10.0.tgz"; + sha1 = "717b36fc61c4e9cb3755f0a9f90996ee5b46f0d0"; + }; + }; + "simple-sha1-2.0.8" = { + name = "simple-sha1"; + packageName = "simple-sha1"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz"; + sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; + }; + }; + "rusha-0.8.4" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; + sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; + }; + }; + "simple-concat-1.0.0" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; + sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "once-1.2.0" = { + name = "once"; + packageName = "once"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz"; + sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; + }; + }; + "deep-extend-0.2.11" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; + sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; + }; + }; + "strip-json-comments-0.1.3" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; + sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; + }; + }; + "ini-1.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + }; + }; + "bitfield-0.1.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; + sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; + }; + }; + "bncode-0.5.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; + sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; + }; + }; + "end-of-stream-0.1.5" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz"; + sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf"; + }; + }; + "fs-chunk-store-1.6.4" = { + name = "fs-chunk-store"; + packageName = "fs-chunk-store"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.4.tgz"; + sha1 = "5aa0025d58533118552e815f5986f39f93b06e69"; + }; + }; + "hat-0.0.3" = { + name = "hat"; + packageName = "hat"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; + }; + }; + "immediate-chunk-store-1.0.8" = { + name = "immediate-chunk-store"; + packageName = "immediate-chunk-store"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz"; + sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; + }; + }; + "ip-set-1.0.1" = { + name = "ip-set"; + packageName = "ip-set"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; + sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "parse-torrent-4.1.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz"; + sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; + }; + }; + "peer-wire-swarm-0.12.1" = { + name = "peer-wire-swarm"; + packageName = "peer-wire-swarm"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; + sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; + }; + }; + "torrent-discovery-5.4.0" = { + name = "torrent-discovery"; + packageName = "torrent-discovery"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; + sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; + }; + }; + "torrent-piece-1.1.0" = { + name = "torrent-piece"; + packageName = "torrent-piece"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz"; + sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; + }; + }; + "random-access-file-1.3.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.3.1.tgz"; + sha1 = "5302a65a7ff2b83c50e18d79bf4cd619b520ac8d"; + }; + }; + "run-parallel-1.1.6" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; + sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; + }; + }; + "thunky-1.0.1" = { + name = "thunky"; + packageName = "thunky"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz"; + sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; + }; + }; + "ip-1.1.3" = { + name = "ip"; + packageName = "ip"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.3.tgz"; + sha1 = "12b16294a38925486d618a1103506e4eb4f8b296"; + }; + }; + "magnet-uri-4.2.3" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; + sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; + }; + }; + "parse-torrent-file-2.1.4" = { + name = "parse-torrent-file"; + packageName = "parse-torrent-file"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz"; + sha1 = "32d4b6afde631420e5f415919a222b774b575707"; + }; + }; + "flatten-0.0.1" = { + name = "flatten"; + packageName = "flatten"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"; + sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; + }; + }; + "thirty-two-0.0.2" = { + name = "thirty-two"; + packageName = "thirty-two"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz"; + sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a"; + }; + }; + "bencode-0.7.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz"; + sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083"; + }; + }; + "fifo-0.1.4" = { + name = "fifo"; + packageName = "fifo"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; + sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; + }; + }; + "peer-wire-protocol-0.7.0" = { + name = "peer-wire-protocol"; + packageName = "peer-wire-protocol"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; + sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + }; + }; + "speedometer-0.1.4" = { + name = "speedometer"; + packageName = "speedometer"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz"; + sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d"; + }; + }; + "utp-0.0.7" = { + name = "utp"; + packageName = "utp"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/utp/-/utp-0.0.7.tgz"; + sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; + }; + }; + "bncode-0.2.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; + sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; + }; + }; + "cyclist-0.1.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz"; + sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; + }; + }; + "bittorrent-dht-6.4.2" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "6.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; + sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; + }; + }; + "bittorrent-tracker-7.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "7.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz"; + sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; + }; + }; + "re-emitter-1.1.3" = { + name = "re-emitter"; + packageName = "re-emitter"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz"; + sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; + }; + }; + "buffer-equals-1.0.4" = { + name = "buffer-equals"; + packageName = "buffer-equals"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; + }; + }; + "k-bucket-0.6.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; + sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; + }; + }; + "k-rpc-3.7.0" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz"; + sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; + }; + }; + "lru-2.0.1" = { + name = "lru"; + packageName = "lru"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; + sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; + }; + }; + "buffer-equal-0.0.1" = { + name = "buffer-equal"; + packageName = "buffer-equal"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }; + }; + "k-bucket-2.0.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; + sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; + }; + }; + "k-rpc-socket-1.6.0" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.0.tgz"; + sha1 = "28c3909cf1547aaa47d5cd924034d55720f7ba64"; + }; + }; + "bencode-0.8.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz"; + sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19"; + }; + }; + "compact2string-1.4.0" = { + name = "compact2string"; + packageName = "compact2string"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; + }; + }; + "random-iterate-1.0.1" = { + name = "random-iterate"; + packageName = "random-iterate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz"; + sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; + }; + }; + "run-series-1.1.4" = { + name = "run-series"; + packageName = "run-series"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; + sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; + }; + }; + "simple-peer-6.0.7" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "6.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.7.tgz"; + sha1 = "ccc5133b7e75e154ab17b9ccdbec91e970cc2278"; + }; + }; + "simple-websocket-4.1.0" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.1.0.tgz"; + sha1 = "2b1e887e7737ae1452458ead0d0a79722901877f"; + }; + }; + "string2compact-1.2.2" = { + name = "string2compact"; + packageName = "string2compact"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz"; + sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; + }; + }; + "ws-1.1.1" = { + name = "ws"; + packageName = "ws"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; + sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + }; + }; + "ipaddr.js-1.2.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; + sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; + }; + }; + "get-browser-rtc-1.0.2" = { + name = "get-browser-rtc"; + packageName = "get-browser-rtc"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; + sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; + }; + }; + "addr-to-ip-port-1.4.2" = { + name = "addr-to-ip-port"; + packageName = "addr-to-ip-port"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; + sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; + }; + }; + "options-0.0.6" = { + name = "options"; + packageName = "options"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + }; + "ultron-1.0.2" = { + name = "ultron"; + packageName = "ultron"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; + sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + }; + }; + "chalk-0.5.1" = { + name = "chalk"; + packageName = "chalk"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + }; + }; + "pad-0.0.5" = { + name = "pad"; + packageName = "pad"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; + sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05"; + }; + }; + "single-line-log-0.4.1" = { + name = "single-line-log"; + packageName = "single-line-log"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz"; + sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee"; + }; + }; + "ansi-styles-1.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + }; + }; + "has-ansi-0.1.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + }; + }; + "strip-ansi-0.3.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + }; + }; + "supports-color-0.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; + sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + }; + }; + "ansi-regex-0.2.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; + }; + }; + "magnet-uri-2.0.1" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; + }; + }; + "request-2.16.6" = { + name = "request"; + packageName = "request"; + version = "2.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + }; + }; + "form-data-0.0.10" = { + name = "form-data"; + packageName = "form-data"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "hawk-0.10.2" = { + name = "hawk"; + packageName = "hawk"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; + }; + }; + "cookie-jar-0.2.0" = { + name = "cookie-jar"; + packageName = "cookie-jar"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; + }; + }; + "aws-sign-0.2.0" = { + name = "aws-sign"; + packageName = "aws-sign"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + }; + }; + "oauth-sign-0.2.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + }; + }; + "forever-agent-0.2.0" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + }; + }; + "tunnel-agent-0.2.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + }; + }; + "json-stringify-safe-3.0.0" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + }; + }; + "qs-0.5.6" = { + name = "qs"; + packageName = "qs"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + }; + }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; + "hoek-0.7.6" = { + name = "hoek"; + packageName = "hoek"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + }; + }; + "boom-0.3.8" = { + name = "boom"; + packageName = "boom"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; + }; + }; + "cryptiles-0.1.3" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; + }; + }; + "sntp-0.1.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + }; + }; + "codepage-1.4.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz"; + sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837"; + }; + }; + "utfx-1.0.1" = { + name = "utfx"; + packageName = "utfx"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utfx/-/utfx-1.0.1.tgz"; + sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; + }; + }; + "voc-0.5.0" = { + name = "voc"; + packageName = "voc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/voc/-/voc-0.5.0.tgz"; + sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c"; + }; + }; + "exit-on-epipe-0.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz"; + sha1 = "ea41650007098c8444519a5d48958170c4ad929b"; + }; + }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; + "xmlbuilder-4.2.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz"; + sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; + }; + }; + "cordova-common-1.5.1" = { + name = "cordova-common"; + packageName = "cordova-common"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz"; + sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3"; + }; + }; + "cordova-lib-6.4.0" = { + name = "cordova-lib"; + packageName = "cordova-lib"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz"; + sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; + }; + }; + "insight-0.8.3" = { + name = "insight"; + packageName = "insight"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/insight/-/insight-0.8.3.tgz"; + sha1 = "72d1e1b4da6c8b405db25043f9d86900f8cbf59d"; + }; + }; + "nopt-3.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; + sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; + }; + }; + "q-1.0.1" = { + name = "q"; + packageName = "q"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; + }; + }; + "underscore-1.7.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + }; + "update-notifier-0.5.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz"; + sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; + }; + }; + "ansi-0.3.1" = { + name = "ansi"; + packageName = "ansi"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + }; + "bplist-parser-0.1.1" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; + sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; + }; + }; + "cordova-registry-mapper-1.1.15" = { + name = "cordova-registry-mapper"; + packageName = "cordova-registry-mapper"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; + sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; + }; + }; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + }; + }; + "plist-1.2.0" = { + name = "plist"; + packageName = "plist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz"; + sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; + }; + }; + "shelljs-0.5.3" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"; + sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; + }; + }; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; + "unorm-1.4.1" = { + name = "unorm"; + packageName = "unorm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; + sha1 = "364200d5f13646ca8bcd44490271335614792300"; + }; + }; + "big-integer-1.6.16" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.16"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; + }; + }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; + }; + }; + "xmlbuilder-4.0.0" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; + sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; + }; + }; + "aliasify-1.9.0" = { + name = "aliasify"; + packageName = "aliasify"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aliasify/-/aliasify-1.9.0.tgz"; + sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; + }; + }; + "cordova-fetch-1.0.1" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz"; + sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769"; + }; + }; + "cordova-create-1.0.1" = { + name = "cordova-create"; + packageName = "cordova-create"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz"; + sha1 = "f1810401807ceec436ece27241180a83c97f8212"; + }; + }; + "cordova-js-4.2.0" = { + name = "cordova-js"; + packageName = "cordova-js"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz"; + sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; + }; + }; + "cordova-serve-1.0.0" = { + name = "cordova-serve"; + packageName = "cordova-serve"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz"; + sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85"; + }; + }; + "dep-graph-1.1.0" = { + name = "dep-graph"; + packageName = "dep-graph"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; + sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; + }; + }; + "init-package-json-1.9.4" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "1.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz"; + sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856"; + }; + }; + "nopt-3.0.6" = { + name = "nopt"; + packageName = "nopt"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + }; + "npm-2.15.11" = { + name = "npm"; + packageName = "npm"; + version = "2.15.11"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; + }; + }; + "opener-1.4.1" = { + name = "opener"; + packageName = "opener"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz"; + sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895"; + }; + }; + "properties-parser-0.2.3" = { + name = "properties-parser"; + packageName = "properties-parser"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz"; + sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f"; + }; + }; + "request-2.47.0" = { + name = "request"; + packageName = "request"; + version = "2.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.47.0.tgz"; + sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f"; + }; + }; + "semver-4.3.6" = { + name = "semver"; + packageName = "semver"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + }; + }; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + }; + }; + "tar-1.0.2" = { + name = "tar"; + packageName = "tar"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz"; + sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f"; + }; + }; + "unorm-1.3.3" = { + name = "unorm"; + packageName = "unorm"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz"; + sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93"; + }; + }; + "valid-identifier-0.0.1" = { + name = "valid-identifier"; + packageName = "valid-identifier"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz"; + sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; + }; + }; + "xcode-0.8.9" = { + name = "xcode"; + packageName = "xcode"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz"; + sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35"; + }; + }; + "browserify-transform-tools-1.5.3" = { + name = "browserify-transform-tools"; + packageName = "browserify-transform-tools"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.5.3.tgz"; + sha1 = "509c9c652fb6b07bf0d21efceebb1d826f80754b"; + }; + }; + "falafel-1.2.0" = { + name = "falafel"; + packageName = "falafel"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz"; + sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4"; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + }; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; + }; + }; + "dependency-ls-1.0.0" = { + name = "dependency-ls"; + packageName = "dependency-ls"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.0.0.tgz"; + sha1 = "311dc9fa9a840bee4c6ca33954556e5cf09cb5c9"; + }; + }; + "is-url-1.2.2" = { + name = "is-url"; + packageName = "is-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; + sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; + }; + }; + "shelljs-0.7.5" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz"; + sha1 = "2eef7a50a21e1ccf37da00df767ec69e30ad0675"; + }; + }; + "interpret-1.0.1" = { + name = "interpret"; + packageName = "interpret"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; + sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + "cordova-app-hello-world-3.11.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; + sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + }; + }; + "browserify-13.1.0" = { + name = "browserify"; + packageName = "browserify"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; + sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + }; + }; + "compression-1.6.2" = { + name = "compression"; + packageName = "compression"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz"; + sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; + }; + }; + "express-4.14.0" = { + name = "express"; + packageName = "express"; + version = "4.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; + sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + }; + }; + "accepts-1.3.3" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; + sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + }; + }; + "bytes-2.3.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"; + sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; + }; + }; + "compressible-2.0.8" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; + sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + }; + }; + "on-headers-1.0.1" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; + sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + }; + }; + "vary-1.1.0" = { + name = "vary"; + packageName = "vary"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; + sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + }; + }; + "negotiator-0.6.1" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; + sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "content-disposition-0.5.1" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; + sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + }; + }; + "content-type-1.0.2" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; + sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "depd-1.1.0" = { + name = "depd"; + packageName = "depd"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; + sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + }; + }; + "encodeurl-1.0.1" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; + sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.7.0" = { + name = "etag"; + packageName = "etag"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + }; + }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; + "fresh-0.3.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "parseurl-1.3.1" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; + sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "proxy-addr-1.1.2" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz"; + sha1 = "b4cc5f22610d9535824c123aef9d3cf73c40ba37"; + }; + }; + "qs-6.2.0" = { + name = "qs"; + packageName = "qs"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; + sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; + }; + }; + "send-0.14.1" = { + name = "send"; + packageName = "send"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; + sha1 = "a954984325392f51532a7760760e459598c89f7a"; + }; + }; + "serve-static-1.11.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"; + sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; + }; + }; + "type-is-1.6.13" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.13"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; + sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "forwarded-0.1.0" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + }; + "ipaddr.js-1.1.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz"; + sha1 = "c791d95f52b29c1247d5df80ada39b8a73647230"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "http-errors-1.5.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz"; + sha1 = "b1cb3d8260fd8e2386cad3189045943372d48211"; + }; + }; + "setprototypeof-1.0.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"; + sha1 = "52009b27888c4dc48f591949c0a8275834c1ca7e"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "underscore-1.2.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"; + sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; + }; + }; + "npm-package-arg-4.2.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz"; + sha1 = "809bc61cabf54bd5ff94f6165c89ba8ee88c115c"; + }; + }; + "promzard-0.3.0" = { + name = "promzard"; + packageName = "promzard"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + }; + "read-package-json-2.0.4" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz"; + sha1 = "61ed1b2256ea438d8008895090be84b8e799c853"; + }; + }; + "validate-npm-package-name-2.2.2" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"; + sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; + }; + }; + "json-parse-helpfulerror-1.0.3" = { + name = "json-parse-helpfulerror"; + packageName = "json-parse-helpfulerror"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; + sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + }; + }; + "jju-1.3.0" = { + name = "jju"; + packageName = "jju"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; + sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + }; + }; + "builtins-0.0.7" = { + name = "builtins"; + packageName = "builtins"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; + sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; + }; + }; + "abbrev-1.0.9" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; + sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + }; + }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + }; + "ansistyles-0.1.3" = { + name = "ansistyles"; + packageName = "ansistyles"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }; + }; + "archy-1.0.0" = { + name = "archy"; + packageName = "archy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + }; + "async-some-1.0.2" = { + name = "async-some"; + packageName = "async-some"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz"; + sha1 = "4d8a81620d5958791b5b98f802d3207776e95509"; + }; + }; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + }; + "char-spinner-1.0.1" = { + name = "char-spinner"; + packageName = "char-spinner"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz"; + sha1 = "e6ea67bd247e107112983b7ab0479ed362800081"; + }; + }; + "chmodr-1.0.2" = { + name = "chmodr"; + packageName = "chmodr"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; + sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; + }; + }; + "chownr-1.0.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + }; + }; + "cmd-shim-2.0.2" = { + name = "cmd-shim"; + packageName = "cmd-shim"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; + sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; + }; + }; + "columnify-1.5.4" = { + name = "columnify"; + packageName = "columnify"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + }; + }; + "config-chain-1.1.11" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; + sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + }; + }; + "dezalgo-1.0.3" = { + name = "dezalgo"; + packageName = "dezalgo"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + }; + "editor-1.0.0" = { + name = "editor"; + packageName = "editor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + }; + "fs-vacuum-1.2.9" = { + name = "fs-vacuum"; + packageName = "fs-vacuum"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz"; + sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d"; + }; + }; + "fs-write-stream-atomic-1.0.8" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz"; + sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b"; + }; + }; + "fstream-1.0.10" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"; + sha1 = "604e8a92fe26ffd9f6fae30399d4984e1ab22822"; + }; + }; + "fstream-npm-1.1.1" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.1.tgz"; + sha1 = "6b9175db6239a83d8209e232426c494dbb29690c"; + }; + }; + "github-url-from-git-1.4.0" = { + name = "github-url-from-git"; + packageName = "github-url-from-git"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz"; + sha1 = "285e6b520819001bde128674704379e4ff03e0de"; + }; + }; + "github-url-from-username-repo-1.0.2" = { + name = "github-url-from-username-repo"; + packageName = "github-url-from-username-repo"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz"; + sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa"; + }; + }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "lockfile-1.0.2" = { + name = "lockfile"; + packageName = "lockfile"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; + sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; + }; + }; + "lru-cache-4.0.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; + sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + }; + }; + "node-gyp-3.4.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; + sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + }; + }; + "normalize-git-url-3.0.2" = { + name = "normalize-git-url"; + packageName = "normalize-git-url"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz"; + sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4"; + }; + }; + "npm-cache-filename-1.0.2" = { + name = "npm-cache-filename"; + packageName = "npm-cache-filename"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; + sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; + }; + }; + "npm-install-checks-1.0.7" = { + name = "npm-install-checks"; + packageName = "npm-install-checks"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.7.tgz"; + sha1 = "6d91aeda0ac96801f1ed7aadee116a6c0a086a57"; + }; + }; + "npm-package-arg-4.1.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.1.tgz"; + sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; + }; + }; + "npm-registry-client-7.2.1" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; + }; + }; + "npm-user-validate-0.1.5" = { + name = "npm-user-validate"; + packageName = "npm-user-validate"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.5.tgz"; + sha1 = "52465d50c2d20294a57125b996baedbf56c5004b"; + }; + }; + "npmlog-2.0.4" = { + name = "npmlog"; + packageName = "npmlog"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "read-installed-4.0.3" = { + name = "read-installed"; + packageName = "read-installed"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"; + sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; + }; + }; + "realize-package-specifier-3.0.3" = { + name = "realize-package-specifier"; + packageName = "realize-package-specifier"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz"; + sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; + }; + }; + "retry-0.10.0" = { + name = "retry"; + packageName = "retry"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; + }; + }; + "sha-2.0.1" = { + name = "sha"; + packageName = "sha"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"; + sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "sorted-object-2.0.1" = { + name = "sorted-object"; + packageName = "sorted-object"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; + }; + }; + "tar-2.2.1" = { + name = "tar"; + packageName = "tar"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"; + sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "uid-number-0.0.6" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + }; + "umask-1.1.0" = { + name = "umask"; + packageName = "umask"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + }; + "write-file-atomic-1.1.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.4.tgz"; + sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b"; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "clone-1.0.2" = { + name = "clone"; + packageName = "clone"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"; + sha1 = "260b7a99ebb1edfe247538175f783243cb19d149"; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; + "fstream-ignore-1.0.5" = { + name = "fstream-ignore"; + packageName = "fstream-ignore"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; + sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "yallist-2.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + }; + "path-array-1.0.1" = { + name = "path-array"; + packageName = "path-array"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"; + sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; + }; + }; + "array-index-1.0.0" = { + name = "array-index"; + packageName = "array-index"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"; + sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; + }; + }; + "es6-symbol-3.1.0" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz"; + sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa"; + }; + }; + "d-0.1.1" = { + name = "d"; + packageName = "d"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz"; + sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; + }; + }; + "es5-ext-0.10.12" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.12"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz"; + sha1 = "aa84641d4db76b62abba5e45fd805ecbab140047"; + }; + }; + "es6-iterator-2.0.0" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz"; + sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; + }; + }; + "request-2.76.0" = { + name = "request"; + packageName = "request"; + version = "2.76.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz"; + sha1 = "be44505afef70360a0436955106be3945d95560e"; + }; + }; + "form-data-2.1.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"; + sha1 = "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3"; + }; + }; + "qs-6.3.0" = { + name = "qs"; + packageName = "qs"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; + sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "are-we-there-yet-1.1.2" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"; + sha1 = "80e470e95a084794fe1899262c5667c6e88de1b3"; + }; + }; + "gauge-1.2.7" = { + name = "gauge"; + packageName = "gauge"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "lodash.pad-4.5.1" = { + name = "lodash.pad"; + packageName = "lodash.pad"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + }; + }; + "lodash.padend-4.6.1" = { + name = "lodash.padend"; + packageName = "lodash.padend"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + }; + }; + "lodash.padstart-4.6.1" = { + name = "lodash.padstart"; + packageName = "lodash.padstart"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + }; + }; + "debuglog-1.0.1" = { + name = "debuglog"; + packageName = "debuglog"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + }; + "readdir-scoped-modules-1.0.2" = { + name = "readdir-scoped-modules"; + packageName = "readdir-scoped-modules"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"; + sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; + }; + }; + "util-extend-1.0.3" = { + name = "util-extend"; + packageName = "util-extend"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; + "qs-2.3.3" = { + name = "qs"; + packageName = "qs"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; + "pegjs-0.9.0" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.9.0.tgz"; + sha1 = "f6aefa2e3ce56169208e52179dfe41f89141a369"; + }; + }; + "simple-plist-0.1.4" = { + name = "simple-plist"; + packageName = "simple-plist"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.1.4.tgz"; + sha1 = "10eb51b47e33c556eb8ec46d5ee64d64e717db5d"; + }; + }; + "bplist-parser-0.0.6" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz"; + sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9"; + }; + }; + "bplist-creator-0.0.4" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.4.tgz"; + sha1 = "4ac0496782e127a85c1d2026a4f5eb22a7aff991"; + }; + }; + "stream-buffers-0.2.6" = { + name = "stream-buffers"; + packageName = "stream-buffers"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-0.2.6.tgz"; + sha1 = "181c08d5bb3690045f69401b9ae6a7a0cf3313fc"; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "configstore-1.4.0" = { + name = "configstore"; + packageName = "configstore"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; + sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; + }; + }; + "inquirer-0.10.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz"; + sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; + }; + }; + "lodash.debounce-3.1.1" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; + sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + }; + }; + "os-name-1.0.3" = { + name = "os-name"; + packageName = "os-name"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; + sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "xdg-basedir-2.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; + sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + }; + }; + "ansi-escapes-1.4.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + }; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + }; + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + }; + }; + "run-async-0.1.0" = { + name = "run-async"; + packageName = "run-async"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; + sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + }; + }; + "rx-lite-3.1.2" = { + name = "rx-lite"; + packageName = "rx-lite"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; + sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + }; + }; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + }; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + }; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + }; + "code-point-at-1.0.1" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; + sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "mute-stream-0.0.5" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; + sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; + }; + }; + "lodash._getnative-3.9.1" = { + name = "lodash._getnative"; + packageName = "lodash._getnative"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + }; + }; + "osx-release-1.1.0" = { + name = "osx-release"; + packageName = "osx-release"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; + sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; + }; + }; + "win-release-1.1.1" = { + name = "win-release"; + packageName = "win-release"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz"; + sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; + "latest-version-1.0.1" = { + name = "latest-version"; + packageName = "latest-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; + sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; + }; + }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "string-length-1.0.1" = { + name = "string-length"; + packageName = "string-length"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"; + sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; + }; + }; + "package-json-1.2.0" = { + name = "package-json"; + packageName = "package-json"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; + sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; + }; + }; + "got-3.3.1" = { + name = "got"; + packageName = "got"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + }; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + }; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + }; + "rc-1.1.6" = { + name = "rc"; + packageName = "rc"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz"; + sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9"; + }; + }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; + "parserlib-1.0.0" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; + sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + }; + }; + "bluebird-2.9.9" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.9"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; + }; + }; + "bottleneck-1.5.3" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + sha1 = "55fa64920d9670087d44150404525d59f9511c20"; + }; + }; + "event-stream-3.2.2" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; + }; + }; + "express-4.11.2" = { + name = "express"; + packageName = "express"; + version = "4.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; + sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; + }; + }; + "hiredis-0.4.1" = { + name = "hiredis"; + packageName = "hiredis"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; + sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; + }; + }; + "json-rpc2-0.8.1" = { + name = "json-rpc2"; + packageName = "json-rpc2"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; + sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; + }; + }; + "lodash-3.1.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; + }; + }; + "native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = { + name = "native-dns"; + packageName = "native-dns"; + version = "0.6.1"; + src = fetchgit { + url = "https://github.com/okTurtles/node-dns.git"; + rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; + sha256 = "a7342bfd4e952490a8a25a68efcb1d16ecc2391f1044109ebeace89ad284f7a2"; + }; + }; + "native-dns-packet-0.1.1" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; + sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; + }; + }; + "nconf-0.7.1" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; + }; + }; + "properties-1.2.1" = { + name = "properties"; + packageName = "properties"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; + sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; + }; + }; + "redis-0.12.1" = { + name = "redis"; + packageName = "redis"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; + }; + }; + "string-2.0.1" = { + name = "string"; + packageName = "string"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; + sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; + }; + }; + "winston-0.8.0" = { + name = "winston"; + packageName = "winston"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + }; + }; + "superagent-0.21.0" = { + name = "superagent"; + packageName = "superagent"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; + }; + }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "accepts-1.2.13" = { + name = "accepts"; + packageName = "accepts"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; + }; + }; + "content-disposition-0.5.0" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }; + }; + "cookie-signature-1.0.5" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + }; + }; + "debug-2.1.3" = { + name = "debug"; + packageName = "debug"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + }; + }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "escape-html-1.0.1" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + }; + "etag-1.5.1" = { + name = "etag"; + packageName = "etag"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + }; + }; + "finalhandler-0.3.3" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; + }; + }; + "fresh-0.2.4" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }; + }; + "on-finished-2.2.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + }; + }; + "path-to-regexp-0.1.3" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; + }; + }; + "proxy-addr-1.0.10" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; + sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; + }; + }; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + }; + }; + "send-0.11.1" = { + name = "send"; + packageName = "send"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; + sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + }; + }; + "serve-static-1.8.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; + sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; + }; + }; + "type-is-1.5.7" = { + name = "type-is"; + packageName = "type-is"; + version = "1.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; + sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "cookie-0.1.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + }; + "merge-descriptors-0.0.2" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }; + }; + "negotiator-0.5.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + }; + }; + "ms-0.7.0" = { + name = "ms"; + packageName = "ms"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }; + }; + "crc-3.2.1" = { + name = "crc"; + packageName = "crc"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }; + }; + "ee-first-1.1.0" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + }; + "ipaddr.js-1.0.5" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; + sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "mime-types-2.0.14" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; + sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; + }; + }; + "mime-db-1.12.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; + sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; + }; + }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; + "nan-2.4.0" = { + name = "nan"; + packageName = "nan"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; + sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + }; + }; + "jsonparse-0.0.6" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; + sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; + }; + }; + "debug-1.0.4" = { + name = "debug"; + packageName = "debug"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }; + }; + "lodash-2.4.2" = { + name = "lodash"; + packageName = "lodash"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + }; + }; + "es5class-2.3.1" = { + name = "es5class"; + packageName = "es5class"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; + sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; + }; + }; + "faye-websocket-0.11.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; + sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; + }; + }; + "eventemitter3-0.1.6" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; + }; + }; + "ms-0.6.2" = { + name = "ms"; + packageName = "ms"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + }; + "better-curry-1.6.0" = { + name = "better-curry"; + packageName = "better-curry"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; + sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; + }; + }; + "websocket-driver-0.6.5" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + }; + "websocket-extensions-0.1.1" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + }; + "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { + name = "native-dns-cache"; + packageName = "native-dns-cache"; + version = "0.0.2"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-cache.git"; + rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; + sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; + }; + }; + "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.0.4"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; + sha256 = "1f39a4bd88978a0b51d45c32c777fb7f75b12e220cf7d206aa5a12d1e4e80f9d"; + }; + }; + "binaryheap-0.0.3" = { + name = "binaryheap"; + packageName = "binaryheap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; + sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; + }; + }; + "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = { + name = "native-dns-packet"; + packageName = "native-dns-packet"; + version = "0.0.3"; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; + sha256 = "f8aaa7bb3b2a652e52bfe5c13a6531c71d690f621ef4d86d0787838708a50358"; + }; + }; + "buffercursor-0.0.12" = { + name = "buffercursor"; + packageName = "buffercursor"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; + sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; + }; + }; + "verror-1.8.1" = { + name = "verror"; + packageName = "verror"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.8.1.tgz"; + sha1 = "157589400a2d14570a62f2d5dd6a0f6214be3029"; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "qs-1.2.0" = { + name = "qs"; + packageName = "qs"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; + sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; + }; + }; + "formidable-1.0.14" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + }; + "component-emitter-1.1.2" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + }; + "methods-1.0.1" = { + name = "methods"; + packageName = "methods"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }; + }; + "cookiejar-2.0.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + }; + }; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }; + }; + "form-data-0.1.3" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + }; + }; + "readable-stream-1.0.27-1" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.27-1"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + }; + "JSONStream-0.8.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; + sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; + }; + }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; + "cors-2.8.1" = { + name = "cors"; + packageName = "cors"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + }; + }; + "docker-parse-image-3.0.1" = { + name = "docker-parse-image"; + packageName = "docker-parse-image"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz"; + sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; + }; + }; + "end-of-stream-1.1.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; + sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + }; + }; + "from2-1.3.0" = { + name = "from2"; + packageName = "from2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + }; + "fs-blob-store-5.2.1" = { + name = "fs-blob-store"; + packageName = "fs-blob-store"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.2.1.tgz"; + sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; + }; + }; + "level-0.18.0" = { + name = "level"; + packageName = "level"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz"; + sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; + }; + }; + "level-sublevel-6.6.1" = { + name = "level-sublevel"; + packageName = "level-sublevel"; + version = "6.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz"; + sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485"; + }; + }; + "leveldown-0.10.6" = { + name = "leveldown"; + packageName = "leveldown"; + version = "0.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz"; + sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; + }; + }; + "levelup-0.18.6" = { + name = "levelup"; + packageName = "levelup"; + version = "0.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; + sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; + }; + }; + "lexicographic-integer-1.1.0" = { + name = "lexicographic-integer"; + packageName = "lexicographic-integer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz"; + sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8"; + }; + }; + "memdown-0.10.2" = { + name = "memdown"; + packageName = "memdown"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz"; + sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; + }; + }; + "minimist-0.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; + sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; + }; + }; + "ndjson-1.4.3" = { + name = "ndjson"; + packageName = "ndjson"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz"; + sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239"; + }; + }; + "pump-1.0.1" = { + name = "pump"; + packageName = "pump"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz"; + sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a"; + }; + }; + "pumpify-1.3.5" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz"; + sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b"; + }; + }; + "relative-date-1.1.3" = { + name = "relative-date"; + packageName = "relative-date"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz"; + sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; + }; + }; + "root-2.0.0" = { + name = "root"; + packageName = "root"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz"; + sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7"; + }; + }; + "sorted-union-stream-1.0.2" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz"; + sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; + }; + }; + "split2-0.2.1" = { + name = "split2"; + packageName = "split2"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz"; + sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900"; + }; + }; + "stream-collector-1.0.1" = { + name = "stream-collector"; + packageName = "stream-collector"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz"; + sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15"; + }; + }; + "tar-stream-1.5.2" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz"; + sha1 = "fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf"; + }; + }; + "through2-0.6.5" = { + name = "through2"; + packageName = "through2"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; + sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; + }; + }; + "jsonparse-0.0.5" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + }; + }; + "lru-cache-2.7.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + }; + "level-packager-0.18.0" = { + name = "level-packager"; + packageName = "level-packager"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz"; + sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; + }; + }; + "bytewise-1.1.0" = { + name = "bytewise"; + packageName = "bytewise"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; + sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; + }; + }; + "levelup-0.19.1" = { + name = "levelup"; + packageName = "levelup"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; + sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; + }; + }; + "ltgt-2.1.2" = { + name = "ltgt"; + packageName = "ltgt"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz"; + sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d"; + }; + }; + "pull-level-2.0.3" = { + name = "pull-level"; + packageName = "pull-level"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; + sha1 = "9500635e257945d6feede185f5d7a24773455b17"; + }; + }; + "pull-stream-3.4.5" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.4.5.tgz"; + sha1 = "dab04df30f28d1da8db0f236805f25436b01ba72"; + }; + }; + "typewiselite-1.0.0" = { + name = "typewiselite"; + packageName = "typewiselite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz"; + sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e"; + }; + }; + "bytewise-core-1.2.3" = { + name = "bytewise-core"; + packageName = "bytewise-core"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; + sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; + }; + }; + "typewise-1.0.3" = { + name = "typewise"; + packageName = "typewise"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz"; + sha1 = "1067936540af97937cc5dcf9922486e9fa284651"; + }; + }; + "typewise-core-1.2.0" = { + name = "typewise-core"; + packageName = "typewise-core"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz"; + sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195"; + }; + }; + "bl-0.8.2" = { + name = "bl"; + packageName = "bl"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; + sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; + }; + }; + "deferred-leveldown-0.2.0" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; + sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; + }; + }; + "errno-0.1.4" = { + name = "errno"; + packageName = "errno"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; + sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + }; + }; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + }; + }; + "xtend-3.0.0" = { + name = "xtend"; + packageName = "xtend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; + sha1 = "5cce7407baf642cba7becda568111c493f59665a"; + }; + }; + "abstract-leveldown-0.12.4" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "0.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; + sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; + }; + }; + "level-post-1.0.5" = { + name = "level-post"; + packageName = "level-post"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; + sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; + }; + }; + "pull-cat-1.1.11" = { + name = "pull-cat"; + packageName = "pull-cat"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz"; + sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; + }; + }; + "pull-live-1.0.1" = { + name = "pull-live"; + packageName = "pull-live"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz"; + sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; + }; + }; + "pull-pushable-2.0.1" = { + name = "pull-pushable"; + packageName = "pull-pushable"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.0.1.tgz"; + sha1 = "02bdca51a39cf585f483fbecde2fc9378076f212"; + }; + }; + "pull-window-2.1.4" = { + name = "pull-window"; + packageName = "pull-window"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz"; + sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; + }; + }; + "stream-to-pull-stream-1.7.2" = { + name = "stream-to-pull-stream"; + packageName = "stream-to-pull-stream"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz"; + sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde"; + }; + }; + "looper-2.0.0" = { + name = "looper"; + packageName = "looper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz"; + sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec"; + }; + }; + "looper-3.0.0" = { + name = "looper"; + packageName = "looper"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; + sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; + }; + }; + "nan-2.1.0" = { + name = "nan"; + packageName = "nan"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; + sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; + }; + }; + "semver-2.3.2" = { + name = "semver"; + packageName = "semver"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; + sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; + }; + }; + "ltgt-1.0.2" = { + name = "ltgt"; + packageName = "ltgt"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz"; + sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; + }; + }; + "murl-0.4.1" = { + name = "murl"; + packageName = "murl"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz"; + sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939"; + }; + }; + "protein-0.5.0" = { + name = "protein"; + packageName = "protein"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz"; + sha1 = "80ab4e919749351263ef14500d684e57c4202840"; + }; + }; + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; + "async-2.0.1" = { + name = "async"; + packageName = "async"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; + sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + }; + }; + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.1" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; + sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "babel-code-frame-6.16.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz"; + sha1 = "f90e60da0862909d3ce098733b5d3987c97cb8de"; + }; + }; + "doctrine-1.5.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + }; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + }; + "espree-3.3.2" = { + name = "espree"; + packageName = "espree"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; + sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; + }; + }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "file-entry-cache-2.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; + sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + }; + }; + "globals-9.12.0" = { + name = "globals"; + packageName = "globals"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"; + sha1 = "992ce90828c3a55fa8f16fada177adb64664cf9d"; + }; + }; + "ignore-3.2.0" = { + name = "ignore"; + packageName = "ignore"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz"; + sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435"; + }; + }; + "inquirer-0.12.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + }; + "is-resolvable-1.0.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz"; + sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; + }; + }; + "js-yaml-3.6.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; + "pluralize-1.2.1" = { + name = "pluralize"; + packageName = "pluralize"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + }; + "require-uncached-1.0.2" = { + name = "require-uncached"; + packageName = "require-uncached"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"; + sha1 = "67dad3b733089e77030124678a459589faf6a7ec"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "table-3.8.3" = { + name = "table"; + packageName = "table"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; + sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; + }; + }; + "js-tokens-2.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz"; + sha1 = "79903f5563ee778cc1162e6dcf1a0027c97f9cb5"; + }; + }; + "es6-map-0.1.4" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz"; + sha1 = "a34b147be224773a4d7da8072794cefa3632b897"; + }; + }; + "es6-weak-map-2.0.1" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz"; + sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81"; + }; + }; + "esrecurse-4.1.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz"; + sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; + }; + }; + "es6-set-0.1.4" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz"; + sha1 = "9516b6761c2964b92ff479456233a247dc707ce8"; + }; + }; + "event-emitter-0.3.4" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz"; + sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5"; + }; + }; + "estraverse-4.1.1" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; + sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; + }; + }; + "acorn-4.0.3" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; + sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; + }; + }; + "acorn-jsx-3.0.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + }; + }; + "flat-cache-1.2.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz"; + sha1 = "6c837d6225a7de5659323740b36d5361f71691ff"; + }; + }; + "circular-json-0.3.1" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz"; + sha1 = "be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"; + }; + }; + "del-2.2.2" = { + name = "del"; + packageName = "del"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; + sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; + }; + }; + "write-0.2.1" = { + name = "write"; + packageName = "write"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz"; + sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + }; + }; + "globby-5.0.0" = { + name = "globby"; + packageName = "globby"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; + sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + }; + }; + "is-path-cwd-1.0.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + }; + }; + "is-path-in-cwd-1.0.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; + sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "is-path-inside-1.0.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz"; + sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; + }; + }; + "cli-width-2.1.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz"; + sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "tryit-1.0.3" = { + name = "tryit"; + packageName = "tryit"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz"; + sha1 = "393be730a9446fd1ead6da59a014308f36c289cb"; + }; + }; + "argparse-1.0.9" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + }; + }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "fast-levenshtein-2.0.5" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; + sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; + }; + }; + "caller-path-0.1.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + }; + }; + "resolve-from-1.0.1" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + }; + }; + "callsites-0.2.0" = { + name = "callsites"; + packageName = "callsites"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + }; + }; + "ajv-4.8.2" = { + name = "ajv"; + packageName = "ajv"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz"; + sha1 = "65486936ca36fea39a1504332a78bebd5d447bdc"; + }; + }; + "ajv-keywords-1.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; + sha1 = "02550bc605a3e576041565628af972e06c549d50"; + }; + }; + "slice-ansi-0.0.4" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + }; + "string-width-2.0.0" = { + name = "string-width"; + packageName = "string-width"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; + sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "glob-3.2.11" = { + name = "glob"; + packageName = "glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; + }; + }; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; + "cliff-0.1.10" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }; + }; + "flatiron-0.4.3" = { + name = "flatiron"; + packageName = "flatiron"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; + }; + }; + "forever-monitor-1.6.0" = { + name = "forever-monitor"; + packageName = "forever-monitor"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz"; + sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40"; + }; + }; + "nconf-0.6.9" = { + name = "nconf"; + packageName = "nconf"; + version = "0.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; + }; + }; + "nssocket-0.5.3" = { + name = "nssocket"; + packageName = "nssocket"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; + }; + }; + "prettyjson-1.1.3" = { + name = "prettyjson"; + packageName = "prettyjson"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz"; + sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263"; + }; + }; + "shush-1.0.0" = { + name = "shush"; + packageName = "shush"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; + sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + }; + }; + "timespan-2.3.0" = { + name = "timespan"; + packageName = "timespan"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz"; + sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929"; + }; + }; + "broadway-0.3.6" = { + name = "broadway"; + packageName = "broadway"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz"; + sha1 = "7dbef068b954b7907925fd544963b578a902ba7a"; + }; + }; + "optimist-0.6.0" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }; + }; + "director-1.2.7" = { + name = "director"; + packageName = "director"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; + }; + }; + "cliff-0.1.9" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; + sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; + }; + }; + "eventemitter2-0.4.14" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "0.4.14"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + }; + }; + "chokidar-1.6.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz"; + sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"; + }; + }; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + }; + "ps-tree-0.0.3" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; + }; + }; + "anymatch-1.3.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"; + sha1 = "a3e52fa39168c825ff57b0248126ce5a8ff95507"; + }; + }; + "async-each-1.0.1" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + }; + }; + "glob-parent-2.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-glob-2.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; + sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863"; + }; + }; + "readdirp-2.1.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + }; + }; + "fsevents-1.0.14" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz"; + sha1 = "558e8cc38643d8ef40fe45158486d0d25758eee4"; + }; + }; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; + }; + }; + "arr-diff-2.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; + sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf"; + }; + }; + "braces-1.8.5" = { + name = "braces"; + packageName = "braces"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; + sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; + }; + }; + "expand-brackets-0.1.5" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; + sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + }; + }; + "extglob-0.3.2" = { + name = "extglob"; + packageName = "extglob"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; + sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + }; + }; + "filename-regex-2.0.0" = { + name = "filename-regex"; + packageName = "filename-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"; + sha1 = "996e3e80479b98b9897f15a8a58b3d084e926775"; + }; + }; + "is-extglob-1.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; + sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; + }; + }; + "kind-of-3.0.4" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"; + sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74"; + }; + }; + "normalize-path-2.0.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"; + sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a"; + }; + }; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; + }; + }; + "parse-glob-3.0.4" = { + name = "parse-glob"; + packageName = "parse-glob"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; + sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; + }; + }; + "regex-cache-0.4.3" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"; + sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; + }; + }; + "arr-flatten-1.0.1" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"; + sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b"; + }; + }; + "expand-range-1.8.2" = { + name = "expand-range"; + packageName = "expand-range"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; + sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; + }; + }; + "preserve-0.2.0" = { + name = "preserve"; + packageName = "preserve"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; + sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b"; + }; + }; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + }; + }; + "fill-range-2.2.3" = { + name = "fill-range"; + packageName = "fill-range"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"; + sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723"; + }; + }; + "is-number-2.1.0" = { + name = "is-number"; + packageName = "is-number"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; + sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "randomatic-1.1.5" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"; + sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-posix-bracket-0.1.1" = { + name = "is-posix-bracket"; + packageName = "is-posix-bracket"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; + sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + }; + }; + "for-own-0.1.4" = { + name = "for-own"; + packageName = "for-own"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"; + sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "for-in-0.1.6" = { + name = "for-in"; + packageName = "for-in"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; + }; + }; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + }; + }; + "is-dotfile-1.0.2" = { + name = "is-dotfile"; + packageName = "is-dotfile"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"; + sha1 = "2c132383f39199f8edc268ca01b9b007d205cc4d"; + }; + }; + "is-equal-shallow-0.1.3" = { + name = "is-equal-shallow"; + packageName = "is-equal-shallow"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; + sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534"; + }; + }; + "is-primitive-2.0.0" = { + name = "is-primitive"; + packageName = "is-primitive"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; + sha1 = "207bab91638499c07b2adf240a41a87210034575"; + }; + }; + "binary-extensions-1.7.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz"; + sha1 = "6c1610db163abfb34edfe42fa423343a1e01185d"; + }; + }; + "set-immediate-shim-1.0.1" = { + name = "set-immediate-shim"; + packageName = "set-immediate-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + }; + "node-pre-gyp-0.6.31" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.31"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; + sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + }; + }; + "npmlog-4.0.0" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.0.tgz"; + sha1 = "e094503961c70c1774eb76692080e8d578a9f88f"; + }; + }; + "tar-pack-3.3.0" = { + name = "tar-pack"; + packageName = "tar-pack"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; + sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "gauge-2.6.0" = { + name = "gauge"; + packageName = "gauge"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"; + sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46"; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + }; + }; + "wide-align-1.1.0" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"; + sha1 = "40edde802a71fea1f070da3e62dcda2e7add96ad"; + }; + }; + "event-stream-0.5.3" = { + name = "event-stream"; + packageName = "event-stream"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + }; + }; + "optimist-0.2.8" = { + name = "optimist"; + packageName = "optimist"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + sha1 = "e981ab7e268b457948593b55674c099a815cac31"; + }; + }; + "async-0.2.9" = { + name = "async"; + packageName = "async"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }; + }; + "lazy-1.0.11" = { + name = "lazy"; + packageName = "lazy"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + sha1 = "daa068206282542c088288e975c297c1ae77b690"; + }; + }; + "caller-0.0.1" = { + name = "caller"; + packageName = "caller"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; + sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + }; + }; + "tape-2.3.3" = { + name = "tape"; + packageName = "tape"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; + sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; + }; + }; + "deep-equal-0.1.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }; + }; + "defined-0.0.0" = { + name = "defined"; + packageName = "defined"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; + sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "minilog-2.0.8" = { + name = "minilog"; + packageName = "minilog"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz"; + sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; + }; + }; + "tabtab-git+https://github.com/mixu/node-tabtab.git" = { + name = "tabtab"; + packageName = "tabtab"; + version = "0.0.2"; + src = fetchgit { + url = "https://github.com/mixu/node-tabtab.git"; + rev = "94af2b878b174527b6636aec88acd46979247755"; + sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; + }; + }; + "microee-0.0.2" = { + name = "microee"; + packageName = "microee"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz"; + sha1 = "72e80d477075e5e799470f5defea96d1dd121587"; + }; + }; + "findup-sync-0.3.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"; + sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16"; + }; + }; + "grunt-known-options-1.1.0" = { + name = "grunt-known-options"; + packageName = "grunt-known-options"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; + sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + }; + }; + "coffee-script-1.11.1" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; + sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + }; + }; + "jade-1.11.0" = { + name = "jade"; + packageName = "jade"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; + sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; + }; + }; + "q-2.0.3" = { + name = "q"; + packageName = "q"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + }; + }; + "msgpack-1.0.2" = { + name = "msgpack"; + packageName = "msgpack"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz"; + sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c"; + }; + }; + "character-parser-1.2.1" = { + name = "character-parser"; + packageName = "character-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; + }; + }; + "clean-css-3.4.20" = { + name = "clean-css"; + packageName = "clean-css"; + version = "3.4.20"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; + sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; + }; + }; + "commander-2.6.0" = { + name = "commander"; + packageName = "commander"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + }; + "constantinople-3.0.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; + sha1 = "4b945d9937907bcd98ee575122c3817516544141"; + }; + }; + "jstransformer-0.0.2" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; + sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; + }; + }; + "transformers-2.1.0" = { + name = "transformers"; + packageName = "transformers"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; + sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + }; + }; + "uglify-js-2.7.4" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; + sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + }; + }; + "void-elements-2.0.1" = { + name = "void-elements"; + packageName = "void-elements"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + }; + "with-4.0.3" = { + name = "with"; + packageName = "with"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; + sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; + }; + }; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "promise-6.1.0" = { + name = "promise"; + packageName = "promise"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; + sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; + }; + }; + "asap-1.0.0" = { + name = "asap"; + packageName = "asap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; + sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; + }; + }; + "promise-2.0.0" = { + name = "promise"; + packageName = "promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; + }; + }; + "css-1.0.8" = { + name = "css"; + packageName = "css"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; + sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; + }; + }; + "uglify-js-2.2.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; + }; + }; + "is-promise-1.0.1" = { + name = "is-promise"; + packageName = "is-promise"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + }; + }; + "css-parse-1.0.4" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; + }; + }; + "css-stringify-1.0.5" = { + name = "css-stringify"; + packageName = "css-stringify"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "acorn-globals-1.0.9" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; + sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; + }; + }; + "pop-iterate-1.0.1" = { + name = "pop-iterate"; + packageName = "pop-iterate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + }; + "weak-map-1.0.5" = { + name = "weak-map"; + packageName = "weak-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + }; + }; + "deprecated-0.0.1" = { + name = "deprecated"; + packageName = "deprecated"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; + sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; + }; + }; + "gulp-util-3.0.7" = { + name = "gulp-util"; + packageName = "gulp-util"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz"; + sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb"; + }; + }; + "liftoff-2.3.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz"; + sha1 = "a98f2ff67183d8ba7cfaca10548bd7ff0550b385"; + }; + }; + "orchestrator-0.3.7" = { + name = "orchestrator"; + packageName = "orchestrator"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz"; + sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df"; + }; + }; + "pretty-hrtime-1.0.2" = { + name = "pretty-hrtime"; + packageName = "pretty-hrtime"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz"; + sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8"; + }; + }; + "tildify-1.2.0" = { + name = "tildify"; + packageName = "tildify"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz"; + sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; + }; + }; + "v8flags-2.0.11" = { + name = "v8flags"; + packageName = "v8flags"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz"; + sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881"; + }; + }; + "vinyl-fs-0.3.14" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "0.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; + sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; + }; + }; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; + }; + }; + "beeper-1.1.0" = { + name = "beeper"; + packageName = "beeper"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"; + sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "fancy-log-1.2.0" = { + name = "fancy-log"; + packageName = "fancy-log"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz"; + sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8"; + }; + }; + "gulplog-1.0.0" = { + name = "gulplog"; + packageName = "gulplog"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; + sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; + }; + }; + "has-gulplog-0.1.0" = { + name = "has-gulplog"; + packageName = "has-gulplog"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; + sha1 = "6414c82913697da51590397dafb12f22967811ce"; + }; + }; + "lodash._reescape-3.0.0" = { + name = "lodash._reescape"; + packageName = "lodash._reescape"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; + sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"; + }; + }; + "lodash._reevaluate-3.0.0" = { + name = "lodash._reevaluate"; + packageName = "lodash._reevaluate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; + sha1 = "58bc74c40664953ae0b124d806996daca431e2ed"; + }; + }; + "lodash._reinterpolate-3.0.0" = { + name = "lodash._reinterpolate"; + packageName = "lodash._reinterpolate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + }; + }; + "lodash.template-3.6.2" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; + sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f"; + }; + }; + "multipipe-0.1.2" = { + name = "multipipe"; + packageName = "multipipe"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; + sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; + }; + }; + "replace-ext-0.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; + sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + }; + }; + "vinyl-0.5.3" = { + name = "vinyl"; + packageName = "vinyl"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; + sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde"; + }; + }; + "time-stamp-1.0.1" = { + name = "time-stamp"; + packageName = "time-stamp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz"; + sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151"; + }; + }; + "glogg-1.0.0" = { + name = "glogg"; + packageName = "glogg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz"; + sha1 = "7fe0f199f57ac906cf512feead8f90ee4a284fc5"; + }; + }; + "sparkles-1.0.0" = { + name = "sparkles"; + packageName = "sparkles"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz"; + sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; + }; + }; + "lodash._basecopy-3.0.1" = { + name = "lodash._basecopy"; + packageName = "lodash._basecopy"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; + sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; + }; + }; + "lodash._basetostring-3.0.1" = { + name = "lodash._basetostring"; + packageName = "lodash._basetostring"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; + sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5"; + }; + }; + "lodash._basevalues-3.0.0" = { + name = "lodash._basevalues"; + packageName = "lodash._basevalues"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; + sha1 = "5b775762802bde3d3297503e26300820fdf661b7"; + }; + }; + "lodash._isiterateecall-3.0.9" = { + name = "lodash._isiterateecall"; + packageName = "lodash._isiterateecall"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; + sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; + }; + }; + "lodash.escape-3.2.0" = { + name = "lodash.escape"; + packageName = "lodash.escape"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; + sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; + }; + }; + "lodash.keys-3.1.2" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; + sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; + }; + }; + "lodash.restparam-3.6.1" = { + name = "lodash.restparam"; + packageName = "lodash.restparam"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; + sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; + }; + }; + "lodash.templatesettings-3.1.1" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; + sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5"; + }; + }; + "lodash._root-3.0.1" = { + name = "lodash._root"; + packageName = "lodash._root"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + }; + "lodash.isarguments-3.1.0" = { + name = "lodash.isarguments"; + packageName = "lodash.isarguments"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + }; + }; + "lodash.isarray-3.0.4" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; + sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; + }; + }; + "duplexer2-0.0.2" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; + sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + }; + }; + "clone-stats-0.0.1" = { + name = "clone-stats"; + packageName = "clone-stats"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; + sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; + }; + }; + "findup-sync-0.4.3" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz"; + sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; + }; + }; + "fined-1.0.2" = { + name = "fined"; + packageName = "fined"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"; + sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97"; + }; + }; + "flagged-respawn-0.3.2" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; + sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + }; + "lodash.isstring-4.0.1" = { + name = "lodash.isstring"; + packageName = "lodash.isstring"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; + "detect-file-0.1.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz"; + sha1 = "4935dedfd9488648e006b0129566e9386711ea63"; + }; + }; + "resolve-dir-0.1.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz"; + sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e"; + }; + }; + "fs-exists-sync-0.1.0" = { + name = "fs-exists-sync"; + packageName = "fs-exists-sync"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; + sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; + }; + }; + "expand-tilde-1.2.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz"; + sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; + }; + }; + "lodash.assignwith-4.2.0" = { + name = "lodash.assignwith"; + packageName = "lodash.assignwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; + sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + }; + }; + "lodash.isempty-4.4.0" = { + name = "lodash.isempty"; + packageName = "lodash.isempty"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + }; + }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + }; + "parse-filepath-1.0.1" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz"; + sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; + }; + }; + "is-absolute-0.2.6" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz"; + sha1 = "20de69f3db942ef2d87b9c2da36f172235b1b5eb"; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "path-root-0.1.1" = { + name = "path-root"; + packageName = "path-root"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + }; + "is-relative-0.2.1" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz"; + sha1 = "d27f4c7d516d175fb610db84bbeef23c3bc97aa5"; + }; + }; + "is-unc-path-0.1.1" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz"; + sha1 = "ab2533d77ad733561124c3dc0f5cd8b90054c86b"; + }; + }; + "unc-path-regex-0.1.2" = { + name = "unc-path-regex"; + packageName = "unc-path-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + }; + "path-root-regex-0.1.2" = { + name = "path-root-regex"; + packageName = "path-root-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + }; + "sequencify-0.0.7" = { + name = "sequencify"; + packageName = "sequencify"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; + sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; + }; + }; + "stream-consume-0.1.0" = { + name = "stream-consume"; + packageName = "stream-consume"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"; + sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"; + }; + }; + "user-home-1.1.1" = { + name = "user-home"; + packageName = "user-home"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + }; + "glob-stream-3.1.18" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "3.1.18"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; + }; + }; + "glob-watcher-0.0.6" = { + name = "glob-watcher"; + packageName = "glob-watcher"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; + sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; + }; + }; + "strip-bom-1.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; + sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + }; + }; + "vinyl-0.4.6" = { + name = "vinyl"; + packageName = "vinyl"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + }; + }; + "glob-4.5.3" = { + name = "glob"; + packageName = "glob"; + version = "4.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }; + }; + "ordered-read-streams-0.1.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; + sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + }; + }; + "glob2base-0.0.12" = { + name = "glob2base"; + packageName = "glob2base"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; + sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; + }; + }; + "unique-stream-1.0.0" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; + sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + }; + }; + "find-index-0.1.1" = { + name = "find-index"; + packageName = "find-index"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; + sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; + }; + }; + "gaze-0.5.2" = { + name = "gaze"; + packageName = "gaze"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; + sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; + }; + }; + "globule-0.1.0" = { + name = "globule"; + packageName = "globule"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; + sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; + }; + }; + "lodash-1.0.2" = { + name = "lodash"; + packageName = "lodash"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; + sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; + }; + }; + "glob-3.1.21" = { + name = "glob"; + packageName = "glob"; + version = "3.1.21"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; + }; + }; + "minimatch-0.2.14" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + }; + "graceful-fs-1.2.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }; + }; + "inherits-1.0.2" = { + name = "inherits"; + packageName = "inherits"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + }; + }; + "first-chunk-stream-1.0.0" = { + name = "first-chunk-stream"; + packageName = "first-chunk-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; + sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; + }; + }; + "clone-0.2.0" = { + name = "clone"; + packageName = "clone"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + }; + }; + "http-proxy-1.0.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; + sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; + }; + }; + "redis-0.10.3" = { + name = "redis"; + packageName = "redis"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + }; + "lru-cache-2.5.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; + sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + }; + }; + "eventemitter3-2.0.2" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; + sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; + }; + }; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + }; + }; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; + }; + }; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + }; + }; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; + }; + }; + "cli-0.6.6" = { + name = "cli"; + packageName = "cli"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; + }; + }; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + }; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + }; + }; + "lodash-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + }; + }; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + }; + "entities-1.0.0" = { + name = "entities"; + packageName = "entities"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + }; + }; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + }; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + }; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "handlebars-4.0.5" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; + sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "cli-1.0.1" = { + name = "cli"; + packageName = "cli"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; + sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; + }; + }; + "bluebird-3.4.6" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; + sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + }; + }; + "body-parser-1.15.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; + sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; + }; + }; + "combine-lists-1.0.1" = { + name = "combine-lists"; + packageName = "combine-lists"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; + }; + }; + "connect-3.5.0" = { + name = "connect"; + packageName = "connect"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; + }; + }; + "core-js-2.4.1" = { + name = "core-js"; + packageName = "core-js"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"; + sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; + }; + }; + "di-0.0.1" = { + name = "di"; + packageName = "di"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz"; + sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; + }; + }; + "dom-serialize-2.2.1" = { + name = "dom-serialize"; + packageName = "dom-serialize"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"; + sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; + }; + }; + "expand-braces-0.1.2" = { + name = "expand-braces"; + packageName = "expand-braces"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; + sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; + }; + }; + "http-proxy-1.15.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz"; + sha1 = "642fdcaffe52d3448d2bda3b0079e9409064da31"; + }; + }; + "isbinaryfile-3.0.1" = { + name = "isbinaryfile"; + packageName = "isbinaryfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz"; + sha1 = "6e99573675372e841a0520c036b41513d783e79e"; + }; + }; + "log4js-0.6.38" = { + name = "log4js"; + packageName = "log4js"; + version = "0.6.38"; + src = fetchurl { + url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz"; + sha1 = "2c494116695d6fb25480943d3fc872e662a522fd"; + }; + }; + "qjobs-1.1.5" = { + name = "qjobs"; + packageName = "qjobs"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; + sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; + }; + }; + "socket.io-1.4.7" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.7.tgz"; + sha1 = "92b7f7cb88c5797d4daee279fe8075dbe6d3fa1c"; + }; + }; + "tmp-0.0.28" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.28"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; + sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; + }; + }; + "useragent-2.1.9" = { + name = "useragent"; + packageName = "useragent"; + version = "2.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz"; + sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7"; + }; + }; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + }; + }; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + }; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + }; + }; + "custom-event-1.0.1" = { + name = "custom-event"; + packageName = "custom-event"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"; + sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; + }; + }; + "ent-2.2.0" = { + name = "ent"; + packageName = "ent"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; + sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; + }; + }; + "array-slice-0.2.3" = { + name = "array-slice"; + packageName = "array-slice"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; + sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; + }; + }; + "braces-0.1.5" = { + name = "braces"; + packageName = "braces"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; + sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; + }; + }; + "expand-range-0.1.1" = { + name = "expand-range"; + packageName = "expand-range"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; + sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; + }; + }; + "is-number-0.1.1" = { + name = "is-number"; + packageName = "is-number"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; + sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; + }; + }; + "repeat-string-0.2.2" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; + sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; + }; + }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; + "engine.io-1.6.10" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.10.tgz"; + sha1 = "f87d84e1bd21d1a2ec7f8deef0c62054acdfb27a"; + }; + }; + "socket.io-parser-2.2.6" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; + sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; + }; + }; + "socket.io-client-1.4.6" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.6.tgz"; + sha1 = "49b0ba537efd15b8297c84016e642e1c7c752c3d"; + }; + }; + "socket.io-adapter-0.4.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; + sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; + }; + }; + "has-binary-0.1.7" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; + sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + }; + }; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + }; + }; + "ws-1.0.1" = { + name = "ws"; + packageName = "ws"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; + sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; + }; + }; + "engine.io-parser-1.2.4" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; + sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; + }; + }; + "accepts-1.1.4" = { + name = "accepts"; + packageName = "accepts"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; + sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; + }; + }; + "after-0.8.1" = { + name = "after"; + packageName = "after"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "base64-arraybuffer-0.1.2" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; + }; + }; + "blob-0.0.4" = { + name = "blob"; + packageName = "blob"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; + sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; + }; + }; + "has-binary-0.1.6" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; + sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; + }; + }; + "utf8-2.1.0" = { + name = "utf8"; + packageName = "utf8"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; + sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; + }; + }; + "negotiator-0.4.9" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; + sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; + }; + }; + "json3-3.3.2" = { + name = "json3"; + packageName = "json3"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; + }; + }; + "benchmark-1.0.0" = { + name = "benchmark"; + packageName = "benchmark"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; + sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; + }; + }; + "engine.io-client-1.6.9" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.9.tgz"; + sha1 = "1d6ad48048a5083c95096943b29d36efdb212401"; + }; + }; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + }; + "component-emitter-1.2.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; + sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; + }; + }; + "object-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "parseuri-0.0.4" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; + sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; + }; + }; + "to-array-0.1.4" = { + name = "to-array"; + packageName = "to-array"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + }; + }; + "backo2-1.0.2" = { + name = "backo2"; + packageName = "backo2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + }; + }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + }; + }; + "xmlhttprequest-ssl-1.5.1" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; + sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; + }; + }; + "parsejson-0.0.1" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + }; + }; + "parseqs-0.0.2" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + }; + }; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + }; + "yeast-0.1.2" = { + name = "yeast"; + packageName = "yeast"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; + sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; + }; + }; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + }; + "callsite-1.0.0" = { + name = "callsite"; + packageName = "callsite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + }; + "socket.io-parser-2.2.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; + sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; + }; + }; + "json3-3.2.6" = { + name = "json3"; + packageName = "json3"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + }; + }; + "lru-cache-2.2.4" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; + }; + }; + "express-3.21.2" = { + name = "express"; + packageName = "express"; + version = "3.21.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; + sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; + }; + }; + "passport-0.3.2" = { + name = "passport"; + packageName = "passport"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; + sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; + }; + }; + "passport-google-oauth-1.0.0" = { + name = "passport-google-oauth"; + packageName = "passport-google-oauth"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz"; + sha1 = "65f50633192ad0627a18b08960077109d84eb76d"; + }; + }; + "connect-restreamer-1.0.3" = { + name = "connect-restreamer"; + packageName = "connect-restreamer"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz"; + sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; + }; + }; + "connect-2.30.2" = { + name = "connect"; + packageName = "connect"; + version = "2.30.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; + sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; + }; + }; + "cookie-0.1.3" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; + sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; + }; + }; + "escape-html-1.0.2" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; + sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; + }; + }; + "merge-descriptors-1.0.0" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + }; + "send-0.13.0" = { + name = "send"; + packageName = "send"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; + sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; + }; + }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; + "body-parser-1.13.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; + sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; + }; + }; + "cookie-parser-1.3.5" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; + sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; + }; + }; + "compression-1.5.2" = { + name = "compression"; + packageName = "compression"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; + }; + }; + "connect-timeout-1.6.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; + sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; + }; + }; + "csurf-1.8.3" = { + name = "csurf"; + packageName = "csurf"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; + sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; + }; + }; + "errorhandler-1.4.3" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; + sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; + }; + }; + "express-session-1.11.3" = { + name = "express-session"; + packageName = "express-session"; + version = "1.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; + sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; + }; + }; + "finalhandler-0.4.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; + }; + }; + "http-errors-1.3.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + }; + "method-override-2.3.6" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; + sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + }; + }; + "morgan-1.6.1" = { + name = "morgan"; + packageName = "morgan"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; + }; + }; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + }; + "pause-0.1.0" = { + name = "pause"; + packageName = "pause"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; + sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + }; + "response-time-2.3.1" = { + name = "response-time"; + packageName = "response-time"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; + sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + }; + }; + "serve-favicon-2.3.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; + sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + }; + }; + "serve-index-1.7.3" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; + sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; + }; + }; + "serve-static-1.10.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; + sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; + }; + }; + "vhost-3.0.2" = { + name = "vhost"; + packageName = "vhost"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; + sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; + }; + }; + "iconv-lite-0.4.11" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; + }; + }; + "csrf-3.0.3" = { + name = "csrf"; + packageName = "csrf"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; + sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; + }; + }; + "base64-url-1.2.2" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; + sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + }; + }; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + }; + }; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + }; + }; + "uid-safe-2.1.1" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; + sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + }; + }; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + }; + "crc-3.3.0" = { + name = "crc"; + packageName = "crc"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; + sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; + }; + }; + "uid-safe-2.0.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; + sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; + }; + }; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "batch-0.5.3" = { + name = "batch"; + packageName = "batch"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; + sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; + }; + }; + "send-0.13.2" = { + name = "send"; + packageName = "send"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; + sha1 = "765e7607c8055452bba6f0b052595350986036de"; + }; + }; + "statuses-1.2.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "passport-google-oauth1-1.0.0" = { + name = "passport-google-oauth1"; + packageName = "passport-google-oauth1"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz"; + sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc"; + }; + }; + "passport-google-oauth20-1.0.0" = { + name = "passport-google-oauth20"; + packageName = "passport-google-oauth20"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz"; + sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; + }; + }; + "passport-oauth1-1.1.0" = { + name = "passport-oauth1"; + packageName = "passport-oauth1"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; + sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; + }; + }; + "oauth-0.9.14" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; + sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + }; + }; + "passport-oauth2-1.3.0" = { + name = "passport-oauth2"; + packageName = "passport-oauth2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz"; + sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c"; + }; + }; + "uid2-0.0.3" = { + name = "uid2"; + packageName = "uid2"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz"; + sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + }; + }; + "vinyl-1.2.0" = { + name = "vinyl"; + packageName = "vinyl"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz"; + sha1 = "5c88036cf565e5df05558bfc911f8656df218884"; + }; + }; + "vinyl-fs-2.4.4" = { + name = "vinyl-fs"; + packageName = "vinyl-fs"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"; + sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; + }; + }; + "glob-stream-5.3.5" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "5.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; + }; + }; + "gulp-sourcemaps-1.6.0" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; + sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; + }; + }; + "is-valid-glob-0.3.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; + sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; + }; + }; + "lazystream-1.0.0" = { + name = "lazystream"; + packageName = "lazystream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + }; + "lodash.isequal-4.4.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.4.0.tgz"; + sha1 = "6295768e98e14dc15ce8d362ef6340db82852031"; + }; + }; + "merge-stream-1.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz"; + sha1 = "9cfd156fef35421e2b5403ce11dc6eb1962b026e"; + }; + }; + "strip-bom-stream-1.0.0" = { + name = "strip-bom-stream"; + packageName = "strip-bom-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"; + sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee"; + }; + }; + "through2-filter-2.0.0" = { + name = "through2-filter"; + packageName = "through2-filter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz"; + sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec"; + }; + }; + "vali-date-1.0.0" = { + name = "vali-date"; + packageName = "vali-date"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"; + sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; + }; + }; + "glob-parent-3.0.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.1.tgz"; + sha1 = "60021327cc963ddc3b5f085764f500479ecd82ff"; + }; + }; + "ordered-read-streams-0.3.0" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; + sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; + }; + }; + "to-absolute-glob-0.1.1" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"; + sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f"; + }; + }; + "unique-stream-2.2.1" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz"; + sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "is-extglob-2.1.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz"; + sha1 = "33411a482b046bf95e6b0cb27ee2711af4cf15ad"; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "convert-source-map-1.3.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz"; + sha1 = "e9f3e9c6e2728efc2676696a70eb382f73106a67"; + }; + }; + "express-2.5.11" = { + name = "express"; + packageName = "express"; + version = "2.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + }; + "jade-0.27.0" = { + name = "jade"; + packageName = "jade"; + version = "0.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; + }; + }; + "open-0.0.2" = { + name = "open"; + packageName = "open"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz"; + sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; + }; + }; + "winston-0.6.2" = { + name = "winston"; + packageName = "winston"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; + }; + }; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + }; + "node.extend-1.0.0" = { + name = "node.extend"; + packageName = "node.extend"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; + }; + }; + "connect-1.9.2" = { + name = "connect"; + packageName = "connect"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + }; + "mime-1.2.4" = { + name = "mime"; + packageName = "mime"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + }; + "qs-0.4.2" = { + name = "qs"; + packageName = "qs"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + }; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + }; + "async-0.1.22" = { + name = "async"; + packageName = "async"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + }; + }; + "pkginfo-0.2.3" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; + }; + }; + "request-2.9.203" = { + name = "request"; + packageName = "request"; + version = "2.9.203"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; + sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + }; + }; + "optparse-1.0.5" = { + name = "optparse"; + packageName = "optparse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; + sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + }; + }; + "slasp-0.0.4" = { + name = "slasp"; + packageName = "slasp"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; + sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + }; + }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; + "npmconf-2.0.9" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz"; + sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2"; + }; + }; + "tar-1.0.3" = { + name = "tar"; + packageName = "tar"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz"; + sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44"; + }; + }; + "fs.extra-1.2.1" = { + name = "fs.extra"; + packageName = "fs.extra"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz"; + sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733"; + }; + }; + "findit-2.0.0" = { + name = "findit"; + packageName = "findit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; + sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; + }; + }; + "nijs-0.0.23" = { + name = "nijs"; + packageName = "nijs"; + version = "0.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz"; + sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; + }; + }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; + "npmlog-3.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz"; + sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873"; + }; + }; + "uid-number-0.0.5" = { + name = "uid-number"; + packageName = "uid-number"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"; + sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e"; + }; + }; + "fs-extra-0.6.4" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; + }; + }; + "walk-2.2.1" = { + name = "walk"; + packageName = "walk"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; + sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016"; + }; + }; + "jsonfile-1.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; + }; + }; + "forEachAsync-2.2.1" = { + name = "forEachAsync"; + packageName = "forEachAsync"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz"; + sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec"; + }; + }; + "sequence-2.2.1" = { + name = "sequence"; + packageName = "sequence"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + }; + }; + "biased-opener-0.2.8" = { + name = "biased-opener"; + packageName = "biased-opener"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; + sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; + }; + }; + "strong-data-uri-1.0.4" = { + name = "strong-data-uri"; + packageName = "strong-data-uri"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz"; + sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; + }; + }; + "v8-debug-0.7.7" = { + name = "v8-debug"; + packageName = "v8-debug"; + version = "0.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz"; + sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935"; + }; + }; + "v8-profiler-5.6.5" = { + name = "v8-profiler"; + packageName = "v8-profiler"; + version = "5.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz"; + sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be"; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "browser-launcher2-0.4.6" = { + name = "browser-launcher2"; + packageName = "browser-launcher2"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; + sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; + }; + }; + "x-default-browser-0.3.1" = { + name = "x-default-browser"; + packageName = "x-default-browser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; + sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; + }; + }; + "headless-0.1.7" = { + name = "headless"; + packageName = "headless"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz"; + sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8"; + }; + }; + "win-detect-browsers-1.0.2" = { + name = "win-detect-browsers"; + packageName = "win-detect-browsers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz"; + sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; + }; + }; + "uid-0.0.2" = { + name = "uid"; + packageName = "uid"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz"; + sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103"; + }; + }; + "after-0.8.2" = { + name = "after"; + packageName = "after"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; + }; + }; + "yargs-1.3.3" = { + name = "yargs"; + packageName = "yargs"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; + }; + }; + "default-browser-id-1.0.4" = { + name = "default-browser-id"; + packageName = "default-browser-id"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz"; + sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; + }; + }; + "untildify-2.1.0" = { + name = "untildify"; + packageName = "untildify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz"; + sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; + }; + }; + "truncate-1.0.5" = { + name = "truncate"; + packageName = "truncate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; + sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "wrap-ansi-2.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; + sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "es6-promise-3.3.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + }; + }; + "ignore-by-default-1.0.1" = { + name = "ignore-by-default"; + packageName = "ignore-by-default"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + }; + }; + "lodash.defaults-3.1.2" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz"; + sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c"; + }; + }; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + }; + }; + "touch-1.0.0" = { + name = "touch"; + packageName = "touch"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz"; + sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; + }; + }; + "undefsafe-0.0.3" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; + sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; + }; + }; + "lodash.assign-3.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; + sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._createassigner-3.1.1" = { + name = "lodash._createassigner"; + packageName = "lodash._createassigner"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; + sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"; + }; + }; + "lodash._bindcallback-3.0.1" = { + name = "lodash._bindcallback"; + packageName = "lodash._bindcallback"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; + sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; + "bcryptjs-2.3.0" = { + name = "bcryptjs"; + packageName = "bcryptjs"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz"; + sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec"; + }; + }; + "cheerio-0.22.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; + sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; + }; + }; + "clone-2.0.0" = { + name = "clone"; + packageName = "clone"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.0.0.tgz"; + sha1 = "df65d3ca142e4a4a47db33da3468d088a16fc76e"; + }; + }; + "cookie-parser-1.4.3" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz"; + sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; + }; + }; + "cron-1.1.1" = { + name = "cron"; + packageName = "cron"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cron/-/cron-1.1.1.tgz"; + sha1 = "02719d4ef480dfc8ee24d81a3603460ba39013ce"; + }; + }; + "follow-redirects-0.2.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.2.0.tgz"; + sha1 = "e0229d7a388bb5ff7b29f44fc1e1b62e921272df"; + }; + }; + "fs-extra-0.30.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; + sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + }; + }; + "fs.notify-0.0.4" = { + name = "fs.notify"; + packageName = "fs.notify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; + sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; + }; + }; + "i18next-1.10.6" = { + name = "i18next"; + packageName = "i18next"; + version = "1.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz"; + sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; + }; + }; + "mqtt-1.14.1" = { + name = "mqtt"; + packageName = "mqtt"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt/-/mqtt-1.14.1.tgz"; + sha1 = "7e376987153d01793e946d26d46122ebf0c03554"; + }; + }; + "mustache-2.2.1" = { + name = "mustache"; + packageName = "mustache"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz"; + sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876"; + }; + }; + "oauth2orize-1.5.0" = { + name = "oauth2orize"; + packageName = "oauth2orize"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.5.0.tgz"; + sha1 = "e352ff4f1b5bf08f0ee94a09757f8f640eb8e0a6"; + }; + }; + "passport-http-bearer-1.0.1" = { + name = "passport-http-bearer"; + packageName = "passport-http-bearer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; + sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; + }; + }; + "passport-oauth2-client-password-0.1.2" = { + name = "passport-oauth2-client-password"; + packageName = "passport-oauth2-client-password"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; + sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; + }; + }; + "sentiment-1.0.6" = { + name = "sentiment"; + packageName = "sentiment"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz"; + sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1"; + }; + }; + "uglify-js-2.7.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz"; + sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868"; + }; + }; + "when-3.7.7" = { + name = "when"; + packageName = "when"; + version = "3.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; + sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + }; + }; + "ws-0.8.1" = { + name = "ws"; + packageName = "ws"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz"; + sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759"; + }; + }; + "node-red-node-feedparser-0.1.6" = { + name = "node-red-node-feedparser"; + packageName = "node-red-node-feedparser"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.6.tgz"; + sha1 = "42eb2e11a010904e6af7257feb27a2a64a1b578d"; + }; + }; + "node-red-node-email-0.1.11" = { + name = "node-red-node-email"; + packageName = "node-red-node-email"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.11.tgz"; + sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; + }; + }; + "node-red-node-twitter-0.1.7" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; + sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; + }; + }; + "node-red-node-rbe-0.1.5" = { + name = "node-red-node-rbe"; + packageName = "node-red-node-rbe"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz"; + sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d"; + }; + }; + "node-red-node-serialport-0.4.0" = { + name = "node-red-node-serialport"; + packageName = "node-red-node-serialport"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.4.0.tgz"; + sha1 = "dfa63bedd535fa9debef754c373e439f8bc73abe"; + }; + }; + "bcrypt-0.8.7" = { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "htmlparser2-3.9.2" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; + sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; + }; + }; + "lodash.assignin-4.2.0" = { + name = "lodash.assignin"; + packageName = "lodash.assignin"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; + sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; + }; + }; + "lodash.bind-4.2.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; + sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; + }; + }; + "lodash.defaults-4.2.0" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + }; + "lodash.filter-4.6.0" = { + name = "lodash.filter"; + packageName = "lodash.filter"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz"; + sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; + "lodash.foreach-4.5.0" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; + sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; + }; + }; + "lodash.map-4.6.0" = { + name = "lodash.map"; + packageName = "lodash.map"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; + sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; + }; + }; + "lodash.merge-4.6.0" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz"; + sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; + }; + }; + "lodash.reduce-4.6.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; + }; + }; + "lodash.reject-4.6.0" = { + name = "lodash.reject"; + packageName = "lodash.reject"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; + sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; + }; + }; + "lodash.some-4.6.0" = { + name = "lodash.some"; + packageName = "lodash.some"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"; + sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d"; + }; + }; + "css-what-2.1.0" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; + sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "nth-check-1.0.1" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; + sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; + }; + }; + "moment-timezone-0.5.7" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.7.tgz"; + sha1 = "1305bcada16f046dbbc7ac89abf66effff886cb5"; + }; + }; + "retry-0.6.1" = { + name = "retry"; + packageName = "retry"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; + sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; + }; + }; + "cookies-0.6.1" = { + name = "cookies"; + packageName = "cookies"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz"; + sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90"; + }; + }; + "i18next-client-1.10.3" = { + name = "i18next-client"; + packageName = "i18next-client"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz"; + sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9"; + }; + }; + "json5-0.2.0" = { + name = "json5"; + packageName = "json5"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + }; + }; + "keygrip-1.0.1" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz"; + sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; + }; + }; + "commist-1.0.0" = { + name = "commist"; + packageName = "commist"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; + sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; + }; + }; + "help-me-1.0.1" = { + name = "help-me"; + packageName = "help-me"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-1.0.1.tgz"; + sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; + }; + }; + "mqtt-connection-2.1.1" = { + name = "mqtt-connection"; + packageName = "mqtt-connection"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz"; + sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a"; + }; + }; + "mqtt-packet-3.4.7" = { + name = "mqtt-packet"; + packageName = "mqtt-packet"; + version = "3.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.7.tgz"; + sha1 = "be8c267be7f0bf6a2a2d4f6de28307b6e0940e5f"; + }; + }; + "reinterval-1.1.0" = { + name = "reinterval"; + packageName = "reinterval"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; + sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + }; + }; + "split2-2.1.0" = { + name = "split2"; + packageName = "split2"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-2.1.0.tgz"; + sha1 = "7382c148cb622c4b28af7c727f9673730b73f474"; + }; + }; + "websocket-stream-3.3.0" = { + name = "websocket-stream"; + packageName = "websocket-stream"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.0.tgz"; + sha1 = "69ced776afca68688ed5be73d28511a2c329c8ed"; + }; + }; + "leven-1.0.2" = { + name = "leven"; + packageName = "leven"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; + sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; + }; + }; + "callback-stream-1.1.0" = { + name = "callback-stream"; + packageName = "callback-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; + sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; + }; + }; + "reduplexer-1.1.0" = { + name = "reduplexer"; + packageName = "reduplexer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz"; + sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140"; + }; + }; + "lodash.assign-4.0.1" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz"; + sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e"; + }; + }; + "lodash.keys-4.2.0" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; + sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; + }; + }; + "lodash.rest-4.0.5" = { + name = "lodash.rest"; + packageName = "lodash.rest"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.5.tgz"; + sha1 = "954ef75049262038c96d1fc98b28fdaf9f0772aa"; + }; + }; + "bufferutil-1.2.1" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz"; + sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7"; + }; + }; + "utf-8-validate-1.2.1" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz"; + sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c"; + }; + }; + "feedparser-1.1.3" = { + name = "feedparser"; + packageName = "feedparser"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; + sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; + }; + }; + "sax-0.6.1" = { + name = "sax"; + packageName = "sax"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; + sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; + }; + }; + "addressparser-0.1.3" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; + sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; + }; + }; + "array-indexofobject-0.0.1" = { + name = "array-indexofobject"; + packageName = "array-indexofobject"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; + sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; + }; + }; + "nodemailer-1.11.0" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; + sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; + }; + }; + "poplib-0.1.7" = { + name = "poplib"; + packageName = "poplib"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz"; + sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; + }; + }; + "mailparser-0.6.1" = { + name = "mailparser"; + packageName = "mailparser"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz"; + sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; + }; + }; + "imap-0.8.18" = { + name = "imap"; + packageName = "imap"; + version = "0.8.18"; + src = fetchurl { + url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; + sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; + }; + }; + "libmime-1.2.0" = { + name = "libmime"; + packageName = "libmime"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; + sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; + }; + }; + "mailcomposer-2.1.0" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz"; + sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; + }; + }; + "needle-0.11.0" = { + name = "needle"; + packageName = "needle"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; + sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; + }; + }; + "nodemailer-direct-transport-1.1.0" = { + name = "nodemailer-direct-transport"; + packageName = "nodemailer-direct-transport"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"; + sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; + }; + }; + "nodemailer-smtp-transport-1.1.0" = { + name = "nodemailer-smtp-transport"; + packageName = "nodemailer-smtp-transport"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; + sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; + }; + }; + "libbase64-0.1.0" = { + name = "libbase64"; + packageName = "libbase64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; + sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + }; + }; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + }; + }; + "buildmail-2.0.0" = { + name = "buildmail"; + packageName = "buildmail"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"; + sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; + }; + }; + "addressparser-0.3.2" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + }; + "needle-0.10.0" = { + name = "needle"; + packageName = "needle"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; + sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; + }; + }; + "smtp-connection-1.3.8" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"; + sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; + }; + }; + "nodemailer-wellknown-0.1.10" = { + name = "nodemailer-wellknown"; + packageName = "nodemailer-wellknown"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; + sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + }; + }; + "mimelib-0.2.19" = { + name = "mimelib"; + packageName = "mimelib"; + version = "0.2.19"; + src = fetchurl { + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; + sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "uue-3.0.0" = { + name = "uue"; + packageName = "uue"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uue/-/uue-3.0.0.tgz"; + sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; + }; + }; + "utf7-1.0.2" = { + name = "utf7"; + packageName = "utf7"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + }; + }; + "twitter-ng-0.6.2" = { + name = "twitter-ng"; + packageName = "twitter-ng"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz"; + sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; + }; + }; + "serialport-4.0.3" = { + name = "serialport"; + packageName = "serialport"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serialport/-/serialport-4.0.3.tgz"; + sha1 = "31339c4a13f9009852975204f6068c1a6a20a4a1"; + }; + }; + "lie-3.1.0" = { + name = "lie"; + packageName = "lie"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz"; + sha1 = "65e0139eaef9ae791a1f5c8c53692c8d3b4718f4"; + }; + }; + "object.assign-4.0.4" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; + sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + }; + }; + "immediate-3.0.6" = { + name = "immediate"; + packageName = "immediate"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; + "mongoose-3.6.7" = { + name = "mongoose"; + packageName = "mongoose"; + version = "3.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; + }; + }; + "mongoose-lifecycle-1.0.0" = { + name = "mongoose-lifecycle"; + packageName = "mongoose-lifecycle"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; + sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; + }; + }; + "express-3.2.0" = { + name = "express"; + packageName = "express"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; + sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; + }; + }; + "express-partials-0.0.6" = { + name = "express-partials"; + packageName = "express-partials"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; + }; + }; + "connect-flash-0.1.0" = { + name = "connect-flash"; + packageName = "connect-flash"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; + }; + }; + "ejs-0.8.3" = { + name = "ejs"; + packageName = "ejs"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; + }; + }; + "config-0.4.15" = { + name = "config"; + packageName = "config"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz"; + sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; + }; + }; + "socket.io-0.9.14" = { + name = "socket.io"; + packageName = "socket.io"; + version = "0.9.14"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; + }; + }; + "semver-1.1.0" = { + name = "semver"; + packageName = "semver"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; + }; + }; + "moment-2.1.0" = { + name = "moment"; + packageName = "moment"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + }; + }; + "nodemailer-0.3.35" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "0.3.35"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; + }; + }; + "net-ping-1.1.7" = { + name = "net-ping"; + packageName = "net-ping"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; + sha1 = "49f5bca55a30a3726d69253557f231135a637075"; + }; + }; + "js-yaml-2.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + }; + }; + "hooks-0.2.1" = { + name = "hooks"; + packageName = "hooks"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; + }; + }; + "mongodb-1.2.14" = { + name = "mongodb"; + packageName = "mongodb"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + sha1 = "269665552066437308d0942036646e6795c3a9a3"; + }; + }; + "ms-0.1.0" = { + name = "ms"; + packageName = "ms"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; + }; + }; + "sliced-0.0.3" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; + }; + }; + "muri-0.3.1" = { + name = "muri"; + packageName = "muri"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; + }; + }; + "mpromise-0.2.1" = { + name = "mpromise"; + packageName = "mpromise"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; + }; + }; + "mpath-0.1.1" = { + name = "mpath"; + packageName = "mpath"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; + }; + }; + "bson-0.1.8" = { + name = "bson"; + packageName = "bson"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; + }; + }; + "sliced-0.0.4" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; + }; + }; + "connect-2.7.6" = { + name = "connect"; + packageName = "connect"; + version = "2.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; + }; + }; + "range-parser-0.0.4" = { + name = "range-parser"; + packageName = "range-parser"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + }; + }; + "cookie-0.0.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + }; + }; + "buffer-crc32-0.2.5" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; + sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; + }; + }; + "fresh-0.1.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + }; + }; + "methods-0.0.1" = { + name = "methods"; + packageName = "methods"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + }; + }; + "send-0.1.0" = { + name = "send"; + packageName = "send"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz"; + sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; + }; + }; + "cookie-signature-1.0.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + }; + }; + "qs-0.5.1" = { + name = "qs"; + packageName = "qs"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; + }; + }; + "formidable-1.0.11" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; + }; + }; + "buffer-crc32-0.1.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; + }; + }; + "bytes-0.2.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; + }; + }; + "mime-1.2.6" = { + name = "mime"; + packageName = "mime"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; + }; + }; + "js-yaml-0.3.7" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; + }; + }; + "vows-0.8.1" = { + name = "vows"; + packageName = "vows"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; + sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + }; + }; + "diff-1.0.8" = { + name = "diff"; + packageName = "diff"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + }; + "glob-4.0.6" = { + name = "glob"; + packageName = "glob"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; + sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; + }; + }; + "minimatch-1.0.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; + }; + }; + "socket.io-client-0.9.11" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "0.9.11"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; + sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; + }; + }; + "policyfile-0.0.4" = { + name = "policyfile"; + packageName = "policyfile"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; + }; + }; + "redis-0.7.3" = { + name = "redis"; + packageName = "redis"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; + }; + }; + "uglify-js-1.2.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; + }; + }; + "ws-0.4.32" = { + name = "ws"; + packageName = "ws"; + version = "0.4.32"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + }; + "xmlhttprequest-1.4.2" = { + name = "xmlhttprequest"; + packageName = "xmlhttprequest"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; + sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; + }; + }; + "active-x-obfuscator-0.0.1" = { + name = "active-x-obfuscator"; + packageName = "active-x-obfuscator"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; + }; + }; + "commander-2.1.0" = { + name = "commander"; + packageName = "commander"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + }; + "nan-1.0.0" = { + name = "nan"; + packageName = "nan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }; + }; + "tinycolor-0.0.1" = { + name = "tinycolor"; + packageName = "tinycolor"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + }; + "zeparser-0.0.5" = { + name = "zeparser"; + packageName = "zeparser"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; + }; + }; + "mailcomposer-3.12.0" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; + }; + }; + "simplesmtp-0.3.35" = { + name = "simplesmtp"; + packageName = "simplesmtp"; + version = "0.3.35"; + src = fetchurl { + url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; + sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; + }; + }; + "buildmail-3.10.0" = { + name = "buildmail"; + packageName = "buildmail"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; + }; + }; + "libmime-2.1.0" = { + name = "libmime"; + packageName = "libmime"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; + }; + }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; + "nodemailer-fetch-1.6.0" = { + name = "nodemailer-fetch"; + packageName = "nodemailer-fetch"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; + }; + }; + "nodemailer-shared-1.1.0" = { + name = "nodemailer-shared"; + packageName = "nodemailer-shared"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; + }; + }; + "rai-0.1.12" = { + name = "rai"; + packageName = "rai"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; + sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; + }; + }; + "xoauth2-0.1.8" = { + name = "xoauth2"; + packageName = "xoauth2"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; + sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; + }; + }; + "raw-socket-1.5.0" = { + name = "raw-socket"; + packageName = "raw-socket"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"; + sha1 = "7a0fba1aef118609011a1205e830e626ca522ae9"; + }; + }; + "argparse-0.1.16" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }; + }; + "esprima-1.0.4" = { + name = "esprima"; + packageName = "esprima"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + }; + "underscore.string-2.4.0" = { + name = "underscore.string"; + packageName = "underscore.string"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }; + }; + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; + "lodash._baseuniq-4.6.0" = { + name = "lodash._baseuniq"; + packageName = "lodash._baseuniq"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "lodash.without-4.4.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; + }; + }; + "npm-install-checks-3.0.0" = { + name = "npm-install-checks"; + packageName = "npm-install-checks"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz"; + sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; + }; + }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; + "read-cmd-shim-1.0.1" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + }; + }; + "read-package-tree-5.1.5" = { + name = "read-package-tree"; + packageName = "read-package-tree"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz"; + sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6"; + }; + }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "unique-filename-1.1.0" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; + sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + }; + }; + "lodash._baseindexof-3.1.0" = { + name = "lodash._baseindexof"; + packageName = "lodash._baseindexof"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"; + sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c"; + }; + }; + "lodash._cacheindexof-3.0.2" = { + name = "lodash._cacheindexof"; + packageName = "lodash._cacheindexof"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"; + sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"; + }; + }; + "lodash._createcache-3.1.2" = { + name = "lodash._createcache"; + packageName = "lodash._createcache"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"; + sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093"; + }; + }; + "lodash._createset-4.0.3" = { + name = "lodash._createset"; + packageName = "lodash._createset"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "unique-slug-2.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; + sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + }; + }; + "argparse-0.1.15" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + }; + }; + "npm-registry-client-0.2.27" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "0.2.27"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; + }; + }; + "npmconf-0.1.1" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; + }; + }; + "tar-0.1.17" = { + name = "tar"; + packageName = "tar"; + version = "0.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + }; + }; + "temp-0.6.0" = { + name = "temp"; + packageName = "temp"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; + }; + }; + "fs.extra-1.3.2" = { + name = "fs.extra"; + packageName = "fs.extra"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; + sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; + }; + }; + "findit-1.2.0" = { + name = "findit"; + packageName = "findit"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; + sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; + }; + }; + "underscore.string-2.3.3" = { + name = "underscore.string"; + packageName = "underscore.string"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }; + }; + "graceful-fs-2.0.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + }; + }; + "semver-2.0.11" = { + name = "semver"; + packageName = "semver"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + }; + }; + "chownr-0.0.2" = { + name = "chownr"; + packageName = "chownr"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; + sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; + }; + }; + "retry-0.6.0" = { + name = "retry"; + packageName = "retry"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + }; + "couch-login-0.1.20" = { + name = "couch-login"; + packageName = "couch-login"; + version = "0.1.20"; + src = fetchurl { + url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; + sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; + }; + }; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + }; + "osenv-0.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + }; + }; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }; + }; + "fstream-0.1.31" = { + name = "fstream"; + packageName = "fstream"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + }; + "rimraf-2.1.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; + }; + }; + "walk-2.3.9" = { + name = "walk"; + packageName = "walk"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; + sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; + }; + }; + "foreachasync-3.0.0" = { + name = "foreachasync"; + packageName = "foreachasync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }; + }; + "cint-8.2.1" = { + name = "cint"; + packageName = "cint"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; + sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; + }; + }; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }; + }; + "fast-diff-1.1.1" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz"; + sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b"; + }; + }; + "node-alias-1.0.4" = { + name = "node-alias"; + packageName = "node-alias"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; + sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; + }; + }; + "npm-3.10.9" = { + name = "npm"; + packageName = "npm"; + version = "3.10.9"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; + sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + }; + }; + "npmi-2.0.1" = { + name = "npmi"; + packageName = "npmi"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz"; + sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; + }; + }; + "require-dir-0.3.1" = { + name = "require-dir"; + packageName = "require-dir"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz"; + sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a"; + }; + }; + "semver-utils-1.1.1" = { + name = "semver-utils"; + packageName = "semver-utils"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; + sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; + }; + }; + "spawn-please-0.2.0" = { + name = "spawn-please"; + packageName = "spawn-please"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz"; + sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; + }; + }; + "update-notifier-1.0.2" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz"; + sha1 = "27c90519196dc15015be02a34ea52986feab8877"; + }; + }; + "boxen-0.6.0" = { + name = "boxen"; + packageName = "boxen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; + sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + }; + }; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; + "lazy-req-1.1.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; + sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; + }; + }; + "ansi-align-1.1.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; + sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "got-5.6.0" = { + name = "got"; + packageName = "got"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.6.0.tgz"; + sha1 = "bb1d7ee163b78082bbc8eb836f3f395004ea6fbf"; + }; + }; + "registry-auth-token-3.1.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; + sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "unzip-response-1.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; + }; + }; + "airplayer-2.0.0" = { + name = "airplayer"; + packageName = "airplayer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz"; + sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259"; + }; + }; + "clivas-0.2.0" = { + name = "clivas"; + packageName = "clivas"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz"; + sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; + }; + }; + "inquirer-1.2.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.2.tgz"; + sha1 = "f725c1316f0020e7f3d538c8c5ad0c2732c1c451"; + }; + }; + "network-address-1.1.0" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz"; + sha1 = "74d577b0dea652284659079fc8d7010b72f01092"; + }; + }; + "airplay-protocol-2.0.2" = { + name = "airplay-protocol"; + packageName = "airplay-protocol"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz"; + sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e"; + }; + }; + "appendable-cli-menu-2.0.0" = { + name = "appendable-cli-menu"; + packageName = "appendable-cli-menu"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz"; + sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; + }; + }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "server-destroy-1.0.1" = { + name = "server-destroy"; + packageName = "server-destroy"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; + sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; + }; + }; + "bplist-creator-0.0.6" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"; + sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; + }; + }; + "reverse-http-1.2.0" = { + name = "reverse-http"; + packageName = "reverse-http"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.2.0.tgz"; + sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728"; + }; + }; + "stream-buffers-2.2.0" = { + name = "stream-buffers"; + packageName = "stream-buffers"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz"; + sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; + }; + }; + "consume-http-header-1.0.0" = { + name = "consume-http-header"; + packageName = "consume-http-header"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/consume-http-header/-/consume-http-header-1.0.0.tgz"; + sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f"; + }; + }; + "consume-until-1.0.0" = { + name = "consume-until"; + packageName = "consume-until"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz"; + sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; + }; + }; + "http-headers-3.0.1" = { + name = "http-headers"; + packageName = "http-headers"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.1.tgz"; + sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; + }; + }; + "buffer-indexof-1.1.0" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; + }; + }; + "next-line-1.1.0" = { + name = "next-line"; + packageName = "next-line"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz"; + sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; + }; + }; + "single-line-log-1.1.2" = { + name = "single-line-log"; + packageName = "single-line-log"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; + }; + }; + "array-flatten-2.1.0" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.0.tgz"; + sha1 = "26a692c83881fc68dac3ec5d1f0c1b49bf2304d9"; + }; + }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "multicast-dns-6.1.0" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; + "dns-packet-1.1.0" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.0.tgz"; + sha1 = "c11ce43bd9977aa789af72de06b6e4ad6e84730d"; + }; + }; + "external-editor-1.1.1" = { + name = "external-editor"; + packageName = "external-editor"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; + sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; + }; + }; + "run-async-2.2.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.2.0.tgz"; + sha1 = "8783abd83c7bb86f41ee0602fc82404b3bd6e8b9"; + }; + }; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + }; + "spawn-sync-1.0.15" = { + name = "spawn-sync"; + packageName = "spawn-sync"; + version = "1.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"; + sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; + }; + }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; + "os-shim-0.1.3" = { + name = "os-shim"; + packageName = "os-shim"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; + }; + }; + "connect-multiparty-1.2.5" = { + name = "connect-multiparty"; + packageName = "connect-multiparty"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz"; + sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7"; + }; + }; + "express-3.5.3" = { + name = "express"; + packageName = "express"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.5.3.tgz"; + sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad"; + }; + }; + "socket.io-0.9.17" = { + name = "socket.io"; + packageName = "socket.io"; + version = "0.9.17"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz"; + sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec"; + }; + }; + "torrent-stream-0.18.1" = { + name = "torrent-stream"; + packageName = "torrent-stream"; + version = "0.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz"; + sha1 = "e2e8ca44d81f16fbe5646e0ebb05f5418fea9bf6"; + }; + }; + "fluent-ffmpeg-2.1.0" = { + name = "fluent-ffmpeg"; + packageName = "fluent-ffmpeg"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.0.tgz"; + sha1 = "e6ab85e75ba8e49119a3900cd9df10d39831d392"; + }; + }; + "on-finished-2.1.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz"; + sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2"; + }; + }; + "qs-2.2.5" = { + name = "qs"; + packageName = "qs"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz"; + sha1 = "1088abaf9dcc0ae5ae45b709e6c6b5888b23923c"; + }; + }; + "connect-2.14.5" = { + name = "connect"; + packageName = "connect"; + version = "2.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.14.5.tgz"; + sha1 = "73217513152c152ebe049c499fa09211b8c476f4"; + }; + }; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + }; + }; + "range-parser-1.0.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz"; + sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0"; + }; + }; + "mkdirp-0.4.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz"; + sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923"; + }; + }; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + }; + }; + "fresh-0.2.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz"; + sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77"; + }; + }; + "methods-0.1.0" = { + name = "methods"; + packageName = "methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }; + }; + "send-0.3.0" = { + name = "send"; + packageName = "send"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.3.0.tgz"; + sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7"; + }; + }; + "cookie-signature-1.0.3" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz"; + sha1 = "91cd997cc51fb641595738c69cda020328f50ff9"; + }; + }; + "debug-0.8.1" = { + name = "debug"; + packageName = "debug"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; + sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; + }; + }; + "cookie-parser-1.0.1" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz"; + sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0"; + }; + }; + "compression-1.0.0" = { + name = "compression"; + packageName = "compression"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz"; + sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020"; + }; + }; + "connect-timeout-1.0.0" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz"; + sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb"; + }; + }; + "csurf-1.1.0" = { + name = "csurf"; + packageName = "csurf"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz"; + sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2"; + }; + }; + "errorhandler-1.0.0" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz"; + sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a"; + }; + }; + "express-session-1.0.2" = { + name = "express-session"; + packageName = "express-session"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz"; + sha1 = "004478c742561774411ceb79733155a56b6d49eb"; + }; + }; + "method-override-1.0.0" = { + name = "method-override"; + packageName = "method-override"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz"; + sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61"; + }; + }; + "morgan-1.0.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz"; + sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d"; + }; + }; + "qs-0.6.6" = { + name = "qs"; + packageName = "qs"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + }; + "raw-body-1.1.4" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz"; + sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d"; + }; + }; + "response-time-1.0.0" = { + name = "response-time"; + packageName = "response-time"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz"; + sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9"; + }; + }; + "setimmediate-1.0.1" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; + sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; + }; + }; + "serve-index-1.0.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz"; + sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6"; + }; + }; + "serve-static-1.1.0" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz"; + sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643"; + }; + }; + "static-favicon-1.0.2" = { + name = "static-favicon"; + packageName = "static-favicon"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz"; + sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f"; + }; + }; + "vhost-1.0.0" = { + name = "vhost"; + packageName = "vhost"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz"; + sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0"; + }; + }; + "bytes-0.3.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz"; + sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935"; + }; + }; + "multiparty-2.2.0" = { + name = "multiparty"; + packageName = "multiparty"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; + }; + }; + "cookie-0.1.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + }; + }; + "bytes-0.2.1" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; + }; + }; + "negotiator-0.3.0" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; + }; + }; + "compressible-1.0.0" = { + name = "compressible"; + packageName = "compressible"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz"; + sha1 = "f83e49c1cb61421753545125a8011d68b492427d"; + }; + }; + "scmp-0.0.3" = { + name = "scmp"; + packageName = "scmp"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz"; + sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073"; + }; + }; + "batch-0.5.0" = { + name = "batch"; + packageName = "batch"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz"; + sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3"; + }; + }; + "negotiator-0.4.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz"; + sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37"; + }; + }; + "parseurl-1.0.1" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz"; + sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4"; + }; + }; + "debug-0.8.0" = { + name = "debug"; + packageName = "debug"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz"; + sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0"; + }; + }; + "socket.io-client-0.9.16" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "0.9.16"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz"; + sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6"; + }; + }; + "bittorrent-dht-3.2.6" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.2.6.tgz"; + sha1 = "8d6f64f002525951536ca403ddd040c03009b7d5"; + }; + }; + "bittorrent-tracker-2.12.1" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "2.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz"; + sha1 = "562f0e43c6340d003b08c5dad3d4bff0eb3fd64d"; + }; + }; + "ip-0.3.3" = { + name = "ip"; + packageName = "ip"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz"; + sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4"; + }; + }; + "peer-wire-swarm-0.9.2" = { + name = "peer-wire-swarm"; + packageName = "peer-wire-swarm"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz"; + sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048"; + }; + }; + "random-access-file-0.3.2" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-0.3.2.tgz"; + sha1 = "cbca246e131db7b68a1c6bb6328dd4d0997100a0"; + }; + }; + "is-ip-1.0.0" = { + name = "is-ip"; + packageName = "is-ip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz"; + sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074"; + }; + }; + "k-bucket-0.5.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.5.0.tgz"; + sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d"; + }; + }; + "simple-get-1.4.3" = { + name = "simple-get"; + packageName = "simple-get"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; + sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; + }; + }; + "ip-regex-1.0.3" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"; + sha1 = "dc589076f659f419c222039a33316f1c7387effd"; + }; + }; + "bencode-0.6.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz"; + sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050"; + }; + }; + "bn.js-1.3.0" = { + name = "bn.js"; + packageName = "bn.js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz"; + sha1 = "0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83"; + }; + }; + "extend.js-0.0.2" = { + name = "extend.js"; + packageName = "extend.js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz"; + sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15"; + }; + }; + "portfinder-0.3.0" = { + name = "portfinder"; + packageName = "portfinder"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz"; + sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0"; + }; + }; + "mkdirp-0.0.7" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz"; + sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072"; + }; + }; + "extract-zip-1.5.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; + sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; + }; + }; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + }; + }; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + }; + }; + "concat-stream-1.5.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; + sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "yauzl-2.4.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; + sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + }; + }; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; + "qs-5.2.1" = { + name = "qs"; + packageName = "qs"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"; + sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; + }; + }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "commoner-0.10.4" = { + name = "commoner"; + packageName = "commoner"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz"; + sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8"; + }; + }; + "jstransform-10.1.0" = { + name = "jstransform"; + packageName = "jstransform"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; + sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; + }; + }; + "private-0.1.6" = { + name = "private"; + packageName = "private"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz"; + sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; + }; + }; + "recast-0.10.43" = { + name = "recast"; + packageName = "recast"; + version = "0.10.43"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz"; + sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f"; + }; + }; + "esprima-fb-15001.1001.0-dev-harmony-fb" = { + name = "esprima-fb"; + packageName = "esprima-fb"; + version = "15001.1001.0-dev-harmony-fb"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz"; + sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659"; + }; + }; + "ast-types-0.8.15" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.8.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz"; + sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52"; + }; + }; + "base62-0.1.1" = { + name = "base62"; + packageName = "base62"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; + sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; + }; + }; + "esprima-fb-13001.1001.0-dev-harmony-fb" = { + name = "esprima-fb"; + packageName = "esprima-fb"; + version = "13001.1001.0-dev-harmony-fb"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; + sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; + }; + }; + "source-map-0.1.31" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; + }; + }; + "aws-sdk-1.18.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; + }; + }; + "commander-2.0.0" = { + name = "commander"; + packageName = "commander"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; + }; + }; + "http-auth-2.0.7" = { + name = "http-auth"; + packageName = "http-auth"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; + }; + }; + "express-3.4.4" = { + name = "express"; + packageName = "express"; + version = "3.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; + sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; + }; + }; + "everyauth-0.4.5" = { + name = "everyauth"; + packageName = "everyauth"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; + }; + }; + "string-1.6.1" = { + name = "string"; + packageName = "string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz"; + sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; + }; + }; + "util-0.4.9" = { + name = "util"; + packageName = "util"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz"; + sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; + }; + }; + "crypto-0.0.3" = { + name = "crypto"; + packageName = "crypto"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; + }; + }; + "xml2js-0.2.4" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; + sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; + }; + }; + "xmlbuilder-0.4.2" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + }; + }; + "coffee-script-1.6.3" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + }; + }; + "node-uuid-1.4.1" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }; + }; + "connect-2.11.0" = { + name = "connect"; + packageName = "connect"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; + }; + }; + "fresh-0.2.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; + }; + }; + "send-0.1.4" = { + name = "send"; + packageName = "send"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + }; + }; + "qs-0.6.5" = { + name = "qs"; + packageName = "qs"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + }; + }; + "raw-body-0.0.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; + }; + }; + "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; + src = fetchurl { + name = "oauth-0.9.14.tar.gz"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + sha256 = "abd0d7be4fb10804e5a38ee66a4db5fc36d2ed045be52e7c8b7e19e4c9e16bd8"; + }; + }; + "connect-2.3.9" = { + name = "connect"; + packageName = "connect"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; + }; + }; + "openid-2.0.6" = { + name = "openid"; + packageName = "openid"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; + }; + }; + "node-swt-0.1.1" = { + name = "node-swt"; + packageName = "node-swt"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + sha1 = "af0903825784be553b93dbae57d99d59060585dd"; + }; + }; + "node-wsfederation-0.1.1" = { + name = "node-wsfederation"; + packageName = "node-wsfederation"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; + }; + }; + "debug-0.5.0" = { + name = "debug"; + packageName = "debug"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; + }; + }; + "crc-0.2.0" = { + name = "crc"; + packageName = "crc"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; + }; + }; + "cookie-0.0.4" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; + }; + }; + "bytes-0.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; + }; + }; + "send-0.0.3" = { + name = "send"; + packageName = "send"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz"; + sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; + }; + }; + "events.node-0.4.9" = { + name = "events.node"; + packageName = "events.node"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; + }; + }; + "express-5.0.0-alpha.2" = { + name = "express"; + packageName = "express"; + version = "5.0.0-alpha.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz"; + sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5"; + }; + }; + "express-json5-0.1.0" = { + name = "express-json5"; + packageName = "express-json5"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz"; + sha1 = "114a514bd734b319e018a1bde337923cc455b836"; + }; + }; + "es6-shim-0.21.1" = { + name = "es6-shim"; + packageName = "es6-shim"; + version = "0.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz"; + sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; + }; + }; + "bunyan-1.8.4" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.4.tgz"; + sha1 = "98013acc812ebc3806364049edf6c9129d8b8d73"; + }; + }; + "handlebars-2.0.0" = { + name = "handlebars"; + packageName = "handlebars"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; + }; + }; + "highlight.js-8.9.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "8.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; + sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; + }; + }; + "lunr-0.7.2" = { + name = "lunr"; + packageName = "lunr"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; + sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; + }; + }; + "render-readme-1.3.1" = { + name = "render-readme"; + packageName = "render-readme"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz"; + sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797"; + }; + }; + "sinopia-htpasswd-0.4.5" = { + name = "sinopia-htpasswd"; + packageName = "sinopia-htpasswd"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz"; + sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; + }; + }; + "fs-ext-0.5.0" = { + name = "fs-ext"; + packageName = "fs-ext"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz"; + sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e"; + }; + }; + "crypt3-0.2.0" = { + name = "crypt3"; + packageName = "crypt3"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz"; + sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; + }; + }; + "array-flatten-1.1.0" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; + sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; + }; + }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; + "path-to-regexp-0.1.6" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; + sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; + }; + }; + "router-1.1.4" = { + name = "router"; + packageName = "router"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz"; + sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97"; + }; + }; + "array-flatten-2.0.0" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz"; + sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc"; + }; + }; + "setprototypeof-1.0.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz"; + sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c"; + }; + }; + "raw-body-1.3.4" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"; + sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54"; + }; + }; + "bytes-1.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + }; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + }; + }; + "dtrace-provider-0.7.1" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.7.1.tgz"; + sha1 = "c06b308f2f10d5d5838aec9c571e5d588dc71d04"; + }; + }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "safe-json-stringify-1.0.3" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; + sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + }; + }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; + "uglify-js-2.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + }; + "markdown-it-4.4.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz"; + sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; + }; + }; + "sanitize-html-1.13.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; + sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + }; + }; + "linkify-it-1.2.4" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz"; + sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; + }; + }; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + }; + "uc.micro-1.0.3" = { + name = "uc.micro"; + packageName = "uc.micro"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + }; + }; + "regexp-quote-0.0.0" = { + name = "regexp-quote"; + packageName = "regexp-quote"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; + sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; + }; + }; + "lru-cache-2.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; + }; + }; + "nopt-2.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; + }; + }; + "restify-4.0.3" = { + name = "restify"; + packageName = "restify"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; + sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; + }; + }; + "bunyan-1.5.1" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"; + sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d"; + }; + }; + "clone-0.1.6" = { + name = "clone"; + packageName = "clone"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; + }; + }; + "smartdc-auth-2.3.1" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz"; + sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; + }; + }; + "cmdln-3.2.1" = { + name = "cmdln"; + packageName = "cmdln"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz"; + sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; + }; + }; + "dashdash-1.7.3" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz"; + sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; + }; + }; + "vasync-1.6.2" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz"; + sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb"; + }; + }; + "backoff-2.5.0" = { + name = "backoff"; + packageName = "backoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; + sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; + }; + }; + "csv-0.4.6" = { + name = "csv"; + packageName = "csv"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; + sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; + }; + }; + "escape-regexp-component-1.0.2" = { + name = "escape-regexp-component"; + packageName = "escape-regexp-component"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz"; + sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; + }; + }; + "http-signature-0.11.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; + sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; + }; + }; + "keep-alive-agent-0.0.1" = { + name = "keep-alive-agent"; + packageName = "keep-alive-agent"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; + }; + }; + "qs-3.1.0" = { + name = "qs"; + packageName = "qs"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; + sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; + }; + }; + "spdy-1.32.5" = { + name = "spdy"; + packageName = "spdy"; + version = "1.32.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; + sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; + }; + }; + "vasync-1.6.3" = { + name = "vasync"; + packageName = "vasync"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz"; + sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; + }; + }; + "dtrace-provider-0.6.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; + sha1 = "0b078d5517937d873101452d9146737557b75e51"; + }; + }; + "precond-0.2.3" = { + name = "precond"; + packageName = "precond"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; + sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + }; + }; + "csv-generate-0.0.6" = { + name = "csv-generate"; + packageName = "csv-generate"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; + sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; + }; + }; + "csv-parse-1.1.7" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz"; + sha1 = "6e4678f7967013ac823929a4303a3ce177115abc"; + }; + }; + "stream-transform-0.1.1" = { + name = "stream-transform"; + packageName = "stream-transform"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz"; + sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71"; + }; + }; + "csv-stringify-0.0.8" = { + name = "csv-stringify"; + packageName = "csv-stringify"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; + sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; + }; + }; + "verror-1.6.0" = { + name = "verror"; + packageName = "verror"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; + sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + }; + }; + "extsprintf-1.2.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; + sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + }; + }; + "assert-plus-0.1.2" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }; + }; + "clone-0.1.5" = { + name = "clone"; + packageName = "clone"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; + }; + }; + "dashdash-1.10.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"; + sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; + }; + }; + "once-1.3.0" = { + name = "once"; + packageName = "once"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz"; + sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; + }; + }; + "sshpk-agent-1.2.1" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz"; + sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; + }; + }; + "sshpk-1.7.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; + sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; + }; + }; + "vasync-1.4.3" = { + name = "vasync"; + packageName = "vasync"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz"; + sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37"; + }; + }; + "jsprim-0.3.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; + }; + }; + "verror-1.1.0" = { + name = "verror"; + packageName = "verror"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; + sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; + }; + }; + "extsprintf-1.0.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; + }; + }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; + "verror-1.3.3" = { + name = "verror"; + packageName = "verror"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; + sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; + }; + }; + "css-parse-1.7.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; + sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; + }; + }; + "coa-1.0.1" = { + name = "coa"; + packageName = "coa"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz"; + sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; + }; + }; + "whet.extend-0.9.9" = { + name = "whet.extend"; + packageName = "whet.extend"; + version = "0.9.9"; + src = fetchurl { + url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; + sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; + }; + }; + "csso-2.2.1" = { + name = "csso"; + packageName = "csso"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"; + sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; + }; + }; + "clap-1.1.1" = { + name = "clap"; + packageName = "clap"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz"; + sha1 = "a8a93e0bfb7581ac199c4f001a5525a724ce696d"; + }; + }; + "fields-0.1.24" = { + name = "fields"; + packageName = "fields"; + version = "0.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; + sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; + }; + }; + "humanize-0.0.9" = { + name = "humanize"; + packageName = "humanize"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; + sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; + }; + }; + "longjohn-0.2.9" = { + name = "longjohn"; + packageName = "longjohn"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz"; + sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519"; + }; + }; + "node-appc-0.2.31" = { + name = "node-appc"; + packageName = "node-appc"; + version = "0.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; + sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; + }; + }; + "request-2.62.0" = { + name = "request"; + packageName = "request"; + version = "2.62.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz"; + sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; + }; + }; + "sprintf-0.1.5" = { + name = "sprintf"; + packageName = "sprintf"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; + }; + }; + "winston-1.0.2" = { + name = "winston"; + packageName = "winston"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; + sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; + }; + }; + "wrench-1.5.8" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; + sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + }; + }; + "source-map-support-0.3.2" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; + sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; + }; + }; + "source-map-0.1.32" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + }; + }; + "adm-zip-0.4.7" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; + }; + }; + "diff-2.1.0" = { + name = "diff"; + packageName = "diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; + sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; + }; + }; + "node-uuid-1.4.3" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + }; + "request-2.61.0" = { + name = "request"; + packageName = "request"; + version = "2.61.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz"; + sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; + }; + }; + "semver-5.0.1" = { + name = "semver"; + packageName = "semver"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; + sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; + }; + }; + "uglify-js-2.4.24" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; + sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; + }; + }; + "har-validator-1.8.0" = { + name = "har-validator"; + packageName = "har-validator"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; + sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; + }; + }; + "bluebird-2.11.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; + sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + }; + }; + "yargs-3.5.4" = { + name = "yargs"; + packageName = "yargs"; + version = "3.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; + sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; + }; + }; + "qs-5.1.0" = { + name = "qs"; + packageName = "qs"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; + sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; + }; + }; + "bluebird-3.3.5" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz"; + sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; + }; + }; + "blueimp-md5-2.3.1" = { + name = "blueimp-md5"; + packageName = "blueimp-md5"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; + }; + }; + "color-0.11.3" = { + name = "color"; + packageName = "color"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-0.11.3.tgz"; + sha1 = "4bad1d0d52499dd00dbd6f0868442467e49394e6"; + }; + }; + "crossroads-0.12.2" = { + name = "crossroads"; + packageName = "crossroads"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz"; + sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; + }; + }; + "diff2html-1.2.0" = { + name = "diff2html"; + packageName = "diff2html"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz"; + sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07"; + }; + }; + "express-4.13.4" = { + name = "express"; + packageName = "express"; + version = "4.13.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz"; + sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24"; + }; + }; + "express-session-1.13.0" = { + name = "express-session"; + packageName = "express-session"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz"; + sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011"; + }; + }; + "forever-monitor-1.1.0" = { + name = "forever-monitor"; + packageName = "forever-monitor"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; + sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; + }; + }; + "getmac-1.2.1" = { + name = "getmac"; + packageName = "getmac"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; + sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; + }; + }; + "hasher-1.2.0" = { + name = "hasher"; + packageName = "hasher"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; + }; + }; + "keen.io-0.1.3" = { + name = "keen.io"; + packageName = "keen.io"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; + sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; + }; + }; + "knockout-3.4.0" = { + name = "knockout"; + packageName = "knockout"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz"; + sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb"; + }; + }; + "lodash-4.12.0" = { + name = "lodash"; + packageName = "lodash"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.12.0.tgz"; + sha1 = "2bd6dc46a040f59e686c972ed21d93dc59053258"; + }; + }; + "moment-2.13.0" = { + name = "moment"; + packageName = "moment"; + version = "2.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz"; + sha1 = "24162d99521e6d40f99ae6939e806d2139eaac52"; + }; + }; + "npm-3.9.6" = { + name = "npm"; + packageName = "npm"; + version = "3.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-3.9.6.tgz"; + sha1 = "0ef1d272a069ad95bdca8b2dfe6fcd82f4b461d7"; + }; + }; + "octicons-3.5.0" = { + name = "octicons"; + packageName = "octicons"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; + sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; + }; + }; + "passport-local-1.0.0" = { + name = "passport-local"; + packageName = "passport-local"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; + sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; + }; + }; + "raven-0.11.0" = { + name = "raven"; + packageName = "raven"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raven/-/raven-0.11.0.tgz"; + sha1 = "32981138a93e4c8ad08cfc17e46b85b453dc107b"; + }; + }; + "signals-1.0.0" = { + name = "signals"; + packageName = "signals"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }; + }; + "snapsvg-0.4.0" = { + name = "snapsvg"; + packageName = "snapsvg"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz"; + sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + }; + }; + "socket.io-1.4.8" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.8.tgz"; + sha1 = "e576f330cd0bed64e55b3fd26df991141884867b"; + }; + }; + "winston-2.2.0" = { + name = "winston"; + packageName = "winston"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz"; + sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7"; + }; + }; + "yargs-4.7.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.7.1.tgz"; + sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; + }; + }; + "color-convert-1.5.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; + }; + }; + "color-string-0.3.0" = { + name = "color-string"; + packageName = "color-string"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"; + sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991"; + }; + }; + "color-name-1.1.1" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz"; + sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; + }; + }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; + "cookie-0.1.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz"; + sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; + }; + }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; + "send-0.13.1" = { + name = "send"; + packageName = "send"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz"; + sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7"; + }; + }; + "cookie-0.2.3" = { + name = "cookie"; + packageName = "cookie"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz"; + sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c"; + }; + }; + "crc-3.4.0" = { + name = "crc"; + packageName = "crc"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; + sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; + }; + }; + "broadway-0.2.10" = { + name = "broadway"; + packageName = "broadway"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz"; + sha1 = "0f58532be140426e9000e49a93e242a0d1263238"; + }; + }; + "minimatch-0.0.5" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; + sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; + }; + }; + "watch-0.5.1" = { + name = "watch"; + packageName = "watch"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; + sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; + }; + }; + "utile-0.1.7" = { + name = "utile"; + packageName = "utile"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; + sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; + }; + }; + "cliff-0.1.8" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; + sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; + }; + }; + "winston-0.7.2" = { + name = "winston"; + packageName = "winston"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; + sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; + }; + }; + "lru-cache-1.0.6" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; + sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; + }; + }; + "ncp-0.2.7" = { + name = "ncp"; + packageName = "ncp"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; + sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; + }; + }; + "rimraf-1.0.9" = { + name = "rimraf"; + packageName = "rimraf"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; + sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; + }; + }; + "extract-opts-3.3.1" = { + name = "extract-opts"; + packageName = "extract-opts"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; + sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; + }; + }; + "eachr-3.2.0" = { + name = "eachr"; + packageName = "eachr"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; + sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; + }; + }; + "editions-1.3.1" = { + name = "editions"; + packageName = "editions"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/editions/-/editions-1.3.1.tgz"; + sha1 = "008425f64dc1401db45ec110e06aa602562419c0"; + }; + }; + "typechecker-4.3.0" = { + name = "typechecker"; + packageName = "typechecker"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.3.0.tgz"; + sha1 = "6f6d6815753e88d6812aa80de4a3fd18948e6e62"; + }; + }; + "underscore-1.5.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; + "node-gyp-3.3.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz"; + sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; + }; + }; + "request-2.72.0" = { + name = "request"; + packageName = "request"; + version = "2.72.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; + sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; + "qs-6.1.0" = { + name = "qs"; + packageName = "qs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; + sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + }; + }; + "lsmod-1.0.0" = { + name = "lsmod"; + packageName = "lsmod"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; + sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; + }; + }; + "stack-trace-0.0.7" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; + sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; + }; + }; + "eve-0.4.2" = { + name = "eve"; + packageName = "eve"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz"; + sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + }; + }; + "engine.io-1.6.11" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.6.11"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.11.tgz"; + sha1 = "2533a97a65876c40ffcf95397b7ef9b495c423fe"; + }; + }; + "socket.io-client-1.4.8" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.8.tgz"; + sha1 = "481b241e73df140ea1a4fb03486a85ad097f5558"; + }; + }; + "ws-1.1.0" = { + name = "ws"; + packageName = "ws"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.0.tgz"; + sha1 = "c1d6fd1515d3ceff1f0ae2759bf5fd77030aad1d"; + }; + }; + "engine.io-client-1.6.11" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "1.6.11"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.11.tgz"; + sha1 = "7d250d8fa1c218119ecde51390458a57d5171376"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "pkg-conf-1.1.3" = { + name = "pkg-conf"; + packageName = "pkg-conf"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-1.1.3.tgz"; + sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "set-blocking-1.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-1.0.0.tgz"; + sha1 = "cd5e5d938048df1ac92dfe92e1f16add656f5ec5"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; + }; + }; + "symbol-0.2.3" = { + name = "symbol"; + packageName = "symbol"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol/-/symbol-0.2.3.tgz"; + sha1 = "3b9873b8a901e47c6efe21526a3ac372ef28bbc7"; + }; + }; + "kew-0.1.7" = { + name = "kew"; + packageName = "kew"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; + }; + }; + "npmconf-0.1.16" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; + sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; + }; + }; + "phantomjs-1.9.20" = { + name = "phantomjs"; + packageName = "phantomjs"; + version = "1.9.20"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz"; + sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; + }; + }; + "follow-redirects-0.0.3" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; + }; + }; + "enhanced-resolve-0.9.1" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; + sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + }; + }; + "interpret-0.6.6" = { + name = "interpret"; + packageName = "interpret"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"; + sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; + }; + }; + "loader-utils-0.2.16" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "0.2.16"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; + }; + }; + "memory-fs-0.3.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; + sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + }; + }; + "node-libs-browser-0.6.0" = { + name = "node-libs-browser"; + packageName = "node-libs-browser"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz"; + sha1 = "244806d44d319e048bc8607b5cc4eaf9a29d2e3c"; + }; + }; + "tapable-0.1.10" = { + name = "tapable"; + packageName = "tapable"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"; + sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; + }; + }; + "watchpack-0.2.9" = { + name = "watchpack"; + packageName = "watchpack"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz"; + sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; + }; + }; + "webpack-core-0.6.8" = { + name = "webpack-core"; + packageName = "webpack-core"; + version = "0.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz"; + sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a"; + }; + }; + "memory-fs-0.2.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; + sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + }; + }; + "big.js-3.1.3" = { + name = "big.js"; + packageName = "big.js"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"; + sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978"; + }; + }; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + }; + "json5-0.5.0" = { + name = "json5"; + packageName = "json5"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz"; + sha1 = "9b20715b026cbe3778fd769edccd822d8332a5b2"; + }; + }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + }; + "constants-browserify-0.0.1" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"; + sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2"; + }; + }; + "crypto-browserify-3.2.8" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz"; + sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189"; + }; + }; + "http-browserify-1.7.0" = { + name = "http-browserify"; + packageName = "http-browserify"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz"; + sha1 = "33795ade72df88acfbfd36773cefeda764735b20"; + }; + }; + "https-browserify-0.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"; + sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd"; + }; + }; + "stream-browserify-1.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz"; + sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193"; + }; + }; + "url-0.10.3" = { + name = "url"; + packageName = "url"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; + sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + }; + }; + "pbkdf2-compat-2.0.1" = { + name = "pbkdf2-compat"; + packageName = "pbkdf2-compat"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; + sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; + }; + }; + "ripemd160-0.2.0" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; + sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; + }; + }; + "sha.js-2.2.6" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; + sha1 = "17ddeddc5f722fb66501658895461977867315ba"; + }; + }; + "Base64-0.2.1" = { + name = "Base64"; + packageName = "Base64"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"; + sha1 = "ba3a4230708e186705065e66babdd4c35cf60028"; + }; + }; + "source-list-map-0.1.6" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz"; + sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f"; + }; + }; + }; +in +{ + alloy = nodeEnv.buildNodePackage { + name = "alloy"; + packageName = "alloy"; + version = "1.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.4.tgz"; + sha1 = "8f85b28758ed0e7a251a635cd2e6a73ce92e9dde"; + }; + dependencies = [ + sources."colors-0.6.0-1" + sources."ejs-2.3.4" + sources."pkginfo-0.2.2" + sources."commander-0.6.1" + sources."wrench-1.3.9" + sources."xmldom-0.1.19" + sources."jsonlint-1.5.1" + (sources."uglify-js-2.4.15" // { + dependencies = [ + sources."source-map-0.1.34" + ]; + }) + sources."resolve-1.1.7" + sources."global-paths-0.1.2" + sources."source-map-0.1.9" + sources."xml2tss-0.0.5" + sources."moment-2.10.6" + sources."node.extend-1.0.10" + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + sources."async-0.2.10" + sources."optimist-0.3.7" + sources."uglify-to-browserify-1.0.2" + sources."amdefine-1.0.0" + sources."wordwrap-0.0.3" + sources."array-unique-0.2.1" + (sources."global-modules-0.2.3" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."is-windows-0.1.1" + (sources."global-prefix-0.1.4" // { + dependencies = [ + sources."is-windows-0.2.0" + ]; + }) + sources."ini-1.3.4" + sources."osenv-0.1.3" + sources."which-1.2.11" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."isexe-1.1.2" + sources."xml2js-0.2.8" + sources."sax-0.5.8" + sources."is-0.3.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Appcelerator Titanium MVC Framework"; + homepage = "https://github.com/appcelerator/alloy#readme"; + license = "Apache-2.0"; + }; + production = true; + }; + azure-cli = nodeEnv.buildNodePackage { + name = "azure-cli"; + packageName = "azure-cli"; + version = "0.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.6.tgz"; + sha1 = "02c79f5337a1d981e14ef6b2529ac09a42436328"; + }; + dependencies = [ + (sources."adal-node-0.1.21" // { + dependencies = [ + sources."node-uuid-1.4.7" + ]; + }) + sources."async-1.4.2" + (sources."azure-common-0.9.18" // { + dependencies = [ + sources."xml2js-0.2.7" + sources."validator-3.22.2" + ]; + }) + sources."azure-arm-authorization-2.0.0" + sources."azure-arm-cdn-0.2.1" + sources."azure-arm-commerce-0.1.1" + sources."azure-arm-compute-0.19.0" + sources."azure-arm-hdinsight-0.2.0" + sources."azure-arm-hdinsight-jobs-0.1.0" + sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-0.1.1" + sources."azure-arm-servermanagement-0.1.2" + sources."azure-arm-network-0.17.0" + sources."azure-arm-powerbiembedded-0.1.0" + sources."azure-arm-trafficmanager-0.10.5" + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.4" + sources."azure-arm-rediscache-0.2.1" + sources."azure-arm-datalake-analytics-0.4.3" + sources."azure-arm-datalake-store-0.4.2" + sources."azure-arm-devtestlabs-0.1.0" + sources."azure-graph-1.1.1" + sources."azure-gallery-2.0.0-pre.18" + sources."azure-keyvault-0.11.0" + sources."azure-asm-compute-0.17.0" + sources."azure-asm-hdinsight-0.10.2" + sources."azure-asm-trafficmanager-0.10.3" + sources."azure-asm-mgmt-0.10.1" + (sources."azure-monitoring-0.10.2" // { + dependencies = [ + sources."moment-2.6.0" + ]; + }) + sources."azure-asm-network-0.13.0" + sources."azure-arm-resource-1.4.5-preview" + sources."azure-arm-storage-0.13.1-preview" + sources."azure-asm-sb-0.10.1" + sources."azure-asm-sql-0.10.1" + sources."azure-asm-storage-0.12.0" + sources."azure-asm-subscription-0.10.1" + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) + (sources."azure-storage-1.3.0" // { + dependencies = [ + sources."node-uuid-1.4.7" + sources."readable-stream-2.0.6" + sources."validator-3.22.2" + sources."xml2js-0.2.7" + sources."isarray-1.0.0" + ]; + }) + sources."azure-arm-batch-0.3.0" + sources."azure-batch-0.5.2" + sources."azure-servicefabric-0.1.4" + sources."applicationinsights-0.15.12" + sources."caller-id-0.1.0" + sources."colors-1.1.2" + sources."commander-1.0.4" + sources."easy-table-0.0.1" + sources."event-stream-3.1.5" + sources."eyes-0.1.8" + sources."github-0.1.6" + sources."fast-json-patch-0.5.6" + sources."js2xmlparser-1.0.0" + sources."jsonlint-1.6.2" + sources."jsonminify-0.4.1" + sources."jsrsasign-4.8.2" + (sources."kuduscript-1.0.9" // { + dependencies = [ + sources."commander-1.1.1" + sources."streamline-0.4.11" + ]; + }) + sources."moment-2.15.2" + sources."ms-rest-1.15.2" + (sources."ms-rest-azure-1.15.2" // { + dependencies = [ + sources."async-0.2.7" + sources."azure-arm-resource-1.4.4-preview" + ]; + }) + sources."node-forge-0.6.23" + sources."node-uuid-1.2.0" + sources."omelette-0.1.0" + sources."openssl-wrapper-0.2.1" + sources."progress-1.1.8" + (sources."prompt-0.2.14" // { + dependencies = [ + (sources."winston-0.8.3" // { + dependencies = [ + sources."pkginfo-0.3.1" + ]; + }) + sources."async-0.2.10" + sources."colors-0.6.2" + ]; + }) + sources."readable-stream-1.0.34" + (sources."request-2.74.0" // { + dependencies = [ + sources."extend-3.0.0" + sources."node-uuid-1.4.7" + ]; + }) + (sources."ssh-key-to-pem-0.11.0" // { + dependencies = [ + sources."asn1-0.1.11" + ]; + }) + sources."streamline-0.10.17" + sources."streamline-streams-0.1.5" + sources."sync-request-3.0.0" + sources."through-2.3.4" + sources."tunnel-0.0.2" + sources."underscore-1.4.4" + sources."user-home-2.0.0" + sources."validator-5.2.0" + (sources."winston-2.1.1" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."wordwrap-0.0.2" + sources."xml2js-0.1.14" + sources."xmlbuilder-0.4.3" + sources."read-1.0.7" + sources."date-utils-1.2.21" + sources."jws-3.1.3" + sources."xmldom-0.1.22" + sources."xpath.js-1.0.6" + sources."base64url-1.0.6" + sources."jwa-1.1.3" + (sources."concat-stream-1.4.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."meow-2.0.0" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."camelcase-keys-1.0.0" + sources."indent-string-1.2.2" + sources."minimist-1.2.0" + sources."object-assign-1.0.0" + sources."camelcase-1.2.1" + sources."map-obj-1.0.1" + sources."get-stdin-4.0.1" + sources."repeating-1.1.3" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."buffer-equal-constant-time-1.0.1" + sources."ecdsa-sig-formatter-1.0.7" + sources."base64-url-1.3.3" + sources."dateformat-1.0.2-1.2.3" + sources."envconf-0.0.4" + sources."duplexer-0.1.1" + sources."sax-0.5.2" + sources."extend-1.2.1" + sources."browserify-mime-1.2.9" + sources."json-edm-parser-0.1.2" + sources."jsonparse-1.2.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."stack-trace-0.0.9" + sources."keypress-0.1.0" + sources."from-0.1.3" + sources."map-stream-0.1.0" + sources."pause-stream-0.0.11" + sources."split-0.2.10" + sources."stream-combiner-0.0.4" + (sources."nomnom-1.8.1" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."JSV-4.0.2" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + sources."uuid-2.0.1" + sources."debug-0.7.4" + sources."q-0.9.7" + sources."pkginfo-0.4.0" + sources."revalidator-0.1.8" + (sources."utile-0.2.1" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."deep-equal-1.0.1" + sources."i-0.3.5" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ncp-0.4.2" + sources."rimraf-2.5.4" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."cycle-1.0.3" + sources."isstream-0.1.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + sources."async-2.1.2" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."lodash-4.16.4" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."ctype-0.5.2" + sources."source-map-0.1.43" + sources."fibers-1.0.15" + sources."galaxy-0.1.12" + sources."amdefine-1.0.0" + sources."http-response-object-1.1.0" + sources."then-request-2.2.0" + sources."http-basic-2.5.1" + sources."promise-7.1.1" + sources."asap-2.0.5" + sources."os-homedir-1.0.2" + sources."mute-stream-0.0.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Microsoft Azure Cross Platform Command Line tool"; + homepage = https://github.com/Azure/azure-xplat-cli; + license = "Apache-2.0"; + }; + production = true; + }; + bower = nodeEnv.buildNodePackage { + name = "bower"; + packageName = "bower"; + version = "1.7.9"; + src = fetchurl { + url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; + sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The browser package manager"; + homepage = http://bower.io/; + license = "MIT"; + }; + production = true; + }; + bower2nix = nodeEnv.buildNodePackage { + name = "bower2nix"; + packageName = "bower2nix"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; + }; + dependencies = [ + sources."argparse-1.0.4" + sources."bower-1.7.9" + sources."bower-endpoint-parser-0.2.1" + sources."bower-json-0.6.0" + sources."bower-logger-0.2.1" + (sources."fs-extra-0.26.7" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) + sources."lodash-4.2.1" + sources."promised-temp-0.1.0" + sources."semver-5.3.0" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."glob-6.0.4" + sources."sprintf-js-1.0.3" + sources."deep-extend-0.4.1" + sources."ext-name-3.0.0" + sources."graceful-fs-3.0.11" + sources."intersect-1.0.1" + sources."ends-with-0.2.0" + sources."ext-list-2.2.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."object-assign-4.1.0" + ]; + }) + sources."sort-keys-length-1.0.1" + sources."got-2.9.2" + sources."duplexify-3.5.0" + sources."infinity-agent-2.0.3" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."nested-error-stacks-1.0.2" + sources."object-assign-2.1.1" + sources."prepend-http-1.0.4" + sources."read-all-stream-2.2.0" + sources."statuses-1.3.0" + sources."timed-out-2.0.0" + sources."end-of-stream-1.0.0" + sources."inherits-2.0.3" + sources."readable-stream-2.1.5" + sources."stream-shift-1.0.0" + sources."once-1.3.3" + sources."wrappy-1.0.2" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + sources."sort-keys-1.1.2" + sources."is-plain-obj-1.1.0" + sources."natives-1.1.0" + (sources."jsonfile-2.4.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) + (sources."klaw-1.3.1" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) + sources."path-is-absolute-1.0.1" + (sources."rimraf-2.5.4" // { + dependencies = [ + sources."glob-7.1.1" + ]; + }) + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."q-1.4.1" + sources."debug-2.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ms-0.7.1" + sources."os-tmpdir-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate nix expressions to fetch bower dependencies"; + homepage = https://github.com/rvl/bower2nix; + license = "GPL-3.0"; + }; + production = true; + }; + browserify = nodeEnv.buildNodePackage { + name = "browserify"; + packageName = "browserify"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-13.1.1.tgz"; + sha1 = "72a2310e2f706ed87db929cf0ee73a5e195d9bb0"; + }; + dependencies = [ + sources."JSONStream-1.2.1" + sources."assert-1.3.0" + sources."browser-pack-6.0.1" + sources."browser-resolve-1.11.2" + sources."browserify-zlib-0.1.4" + sources."buffer-4.9.1" + sources."cached-path-relative-1.0.0" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.11.0" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + sources."glob-5.0.15" + sources."has-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-0.0.1" + sources."inherits-2.0.3" + sources."insert-module-globals-7.0.1" + (sources."labeled-stream-splicer-2.0.0" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."module-deps-4.0.8" + sources."os-browserify-0.1.2" + sources."parents-1.0.1" + sources."path-browserify-0.0.0" + sources."process-0.11.9" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + sources."readable-stream-2.1.5" + sources."resolve-1.1.7" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.4.1" + sources."string_decoder-0.10.31" + sources."subarg-1.0.0" + (sources."syntax-error-1.1.6" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."xtend-4.0.1" + sources."jsonparse-1.2.0" + sources."through-2.3.8" + sources."combine-source-map-0.7.2" + sources."umd-3.0.1" + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."source-map-0.5.6" + sources."pako-0.2.9" + sources."base64-js-1.2.0" + sources."ieee754-1.1.8" + sources."isarray-1.0.0" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."date-now-0.1.4" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.0" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.2" + sources."create-hmac-1.1.4" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.9" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.3" + sources."browserify-aes-1.0.6" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.0" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.3.2" + sources."parse-asn1-5.0.0" + sources."brorand-1.0.6" + sources."hash.js-1.0.3" + sources."asn1.js-4.8.1" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.5" + sources."miller-rabin-4.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."function-bind-1.1.0" + sources."is-buffer-1.1.4" + sources."lexical-scope-1.2.0" + sources."astw-2.0.0" + sources."acorn-1.2.2" + sources."stream-splicer-2.0.0" + (sources."detective-4.3.2" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."stream-combiner2-1.1.1" + sources."path-platform-0.11.15" + sources."buffer-shims-1.0.0" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."builtin-status-codes-2.0.0" + sources."to-arraybuffer-1.0.1" + sources."minimist-1.2.0" + sources."querystring-0.2.0" + sources."indexof-0.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "browser-side require() the node way"; + homepage = "https://github.com/substack/node-browserify#readme"; + license = "MIT"; + }; + production = true; + }; + castnow = nodeEnv.buildNodePackage { + name = "castnow"; + packageName = "castnow"; + version = "0.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz"; + sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8"; + }; + dependencies = [ + sources."array-loop-1.0.0" + sources."castv2-client-1.1.2" + sources."chalk-1.0.0" + sources."chromecast-player-0.2.3" + sources."debounced-seeker-1.0.0" + sources."debug-2.2.0" + sources."fs-extended-0.2.1" + sources."got-1.2.2" + sources."internal-ip-1.2.0" + sources."keypress-0.2.1" + sources."mime-1.3.4" + sources."minimist-1.2.0" + sources."peerflix-0.34.0" + (sources."playerui-1.2.0" // { + dependencies = [ + sources."chalk-0.5.1" + sources."ansi-styles-1.1.0" + sources."has-ansi-0.1.0" + sources."strip-ansi-0.3.0" + sources."supports-color-0.2.0" + sources."ansi-regex-0.2.1" + ]; + }) + sources."query-string-1.0.1" + sources."range-parser-1.2.0" + (sources."read-torrent-1.3.0" // { + dependencies = [ + sources."magnet-uri-2.0.1" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) + sources."thirty-two-0.0.2" + sources."parse-torrent-file-2.1.4" + sources."bencode-0.7.0" + ]; + }) + sources."router-0.6.2" + sources."srt2vtt-1.3.1" + sources."stream-transcoder-0.0.5" + (sources."xml2js-0.4.17" // { + dependencies = [ + sources."xmlbuilder-4.2.1" + sources."lodash-4.16.4" + ]; + }) + sources."xtend-4.0.1" + sources."castv2-0.1.9" + sources."protobufjs-3.8.2" + sources."bytebuffer-3.5.5" + sources."ascli-0.3.0" + sources."long-2.4.0" + sources."bufferview-1.0.1" + sources."colour-0.7.1" + sources."optjs-3.2.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-1.0.3" + sources."strip-ansi-2.0.1" + sources."supports-color-1.3.1" + sources."ansi-regex-1.1.1" + sources."get-stdin-4.0.1" + sources."chromecast-scanner-0.5.0" + sources."mutate.js-0.2.0" + sources."promiscuous-0.6.0" + sources."time-line-1.0.1" + sources."ware-1.3.0" + sources."array-find-0.1.1" + sources."multicast-dns-4.0.1" + sources."thunky-0.1.0" + sources."wrap-fn-0.1.5" + sources."co-3.1.0" + sources."ms-0.7.1" + sources."object-assign-1.0.0" + (sources."meow-3.7.0" // { + dependencies = [ + sources."object-assign-4.1.0" + ]; + }) + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."airplay-js-0.2.16" + sources."clivas-0.1.4" + sources."inquirer-0.8.5" + sources."network-address-0.0.5" + sources."numeral-1.5.3" + sources."open-0.0.5" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."parse-torrent-5.8.1" // { + dependencies = [ + sources."get-stdin-5.0.1" + ]; + }) + (sources."pump-0.3.5" // { + dependencies = [ + sources."once-1.2.0" + ]; + }) + (sources."rc-0.4.0" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."torrent-stream-1.0.3" // { + dependencies = [ + sources."end-of-stream-0.1.5" + sources."parse-torrent-4.1.0" + sources."once-1.3.3" + sources."magnet-uri-4.2.3" + sources."parse-torrent-file-2.1.4" + sources."thirty-two-0.0.2" + sources."bencode-0.7.0" + ]; + }) + sources."windows-no-runnable-0.0.6" + (sources."mdns-js-0.5.0" // { + dependencies = [ + sources."semver-5.1.1" + ]; + }) + sources."plist-2.0.1" + sources."mdns-js-packet-0.2.0" + sources."qap-3.1.3" + sources."base64-js-1.1.2" + sources."xmlbuilder-8.2.2" + sources."xmldom-0.1.22" + sources."cli-width-1.1.1" + (sources."figures-1.7.0" // { + dependencies = [ + sources."object-assign-4.1.0" + ]; + }) + sources."lodash-3.10.1" + sources."readline2-0.1.1" + sources."rx-2.5.3" + sources."through-2.3.8" + sources."mute-stream-0.0.4" + sources."wordwrap-0.0.3" + sources."blob-to-buffer-1.2.6" + sources."magnet-uri-5.1.4" + sources."parse-torrent-file-4.0.0" + sources."simple-get-2.3.0" + sources."thirty-two-1.0.2" + sources."uniq-1.0.1" + sources."bencode-0.10.0" + sources."simple-sha1-2.0.8" + sources."rusha-0.8.4" + sources."once-1.4.0" + sources."simple-concat-1.0.0" + sources."unzip-response-2.0.1" + sources."wrappy-1.0.2" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."deep-extend-0.2.11" + sources."strip-json-comments-0.1.3" + sources."ini-1.1.0" + sources."bitfield-0.1.0" + sources."bncode-0.5.3" + (sources."fs-chunk-store-1.6.4" // { + dependencies = [ + sources."mkdirp-0.5.1" + sources."thunky-1.0.1" + sources."minimist-0.0.8" + ]; + }) + sources."hat-0.0.3" + sources."immediate-chunk-store-1.0.8" + sources."ip-set-1.0.1" + sources."mkdirp-0.3.5" + sources."peer-wire-swarm-0.12.1" + sources."rimraf-2.5.4" + sources."torrent-discovery-5.4.0" + sources."torrent-piece-1.1.0" + (sources."random-access-file-1.3.1" // { + dependencies = [ + sources."mkdirp-0.5.1" + sources."thunky-1.0.1" + sources."minimist-0.0.8" + ]; + }) + sources."randombytes-2.0.3" + sources."run-parallel-1.1.6" + sources."inherits-2.0.3" + sources."ip-1.1.3" + sources."flatten-0.0.1" + sources."fifo-0.1.4" + (sources."peer-wire-protocol-0.7.0" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) + sources."speedometer-0.1.4" + sources."utp-0.0.7" + sources."readable-stream-1.1.14" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."cyclist-0.1.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."bittorrent-dht-6.4.2" // { + dependencies = [ + sources."bencode-0.7.0" + ]; + }) + (sources."bittorrent-tracker-7.7.0" // { + dependencies = [ + sources."bencode-0.8.0" + ]; + }) + sources."re-emitter-1.1.3" + sources."buffer-equals-1.0.4" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + ]; + }) + sources."lru-2.0.1" + sources."buffer-equal-0.0.1" + sources."k-rpc-socket-1.6.0" + sources."bn.js-4.11.6" + sources."compact2string-1.4.0" + sources."random-iterate-1.0.1" + sources."run-series-1.1.4" + (sources."simple-peer-6.0.7" // { + dependencies = [ + sources."readable-stream-2.1.5" + sources."isarray-1.0.0" + ]; + }) + (sources."simple-websocket-4.1.0" // { + dependencies = [ + sources."readable-stream-2.1.5" + sources."isarray-1.0.0" + ]; + }) + sources."string2compact-1.2.2" + sources."ws-1.1.1" + sources."ipaddr.js-1.2.0" + sources."get-browser-rtc-1.0.2" + sources."buffer-shims-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."addr-to-ip-port-1.4.2" + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."pad-0.0.5" + sources."single-line-log-0.4.1" + (sources."request-2.16.6" // { + dependencies = [ + sources."mime-1.2.11" + ]; + }) + (sources."form-data-0.0.10" // { + dependencies = [ + sources."mime-1.2.11" + ]; + }) + sources."hawk-0.10.2" + sources."node-uuid-1.4.7" + sources."cookie-jar-0.2.0" + sources."aws-sign-0.2.0" + sources."oauth-sign-0.2.0" + sources."forever-agent-0.2.0" + sources."tunnel-agent-0.2.0" + sources."json-stringify-safe-3.0.0" + sources."qs-0.5.6" + sources."combined-stream-0.0.7" + sources."async-0.2.10" + sources."delayed-stream-0.0.5" + sources."hoek-0.7.6" + sources."boom-0.3.8" + sources."cryptiles-0.1.3" + sources."sntp-0.1.4" + sources."codepage-1.4.0" + sources."utfx-1.0.1" + sources."voc-0.5.0" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."exit-on-epipe-0.0.1" + sources."commander-2.9.0" + sources."typedarray-0.0.6" + sources."graceful-readlink-1.0.1" + sources."sax-1.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "commandline chromecast player"; + homepage = "https://github.com/xat/castnow#readme"; + license = "MIT"; + }; + production = true; + }; + coffee-script = nodeEnv.buildNodePackage { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz"; + sha1 = "bf1c47ad64443a0d95d12df2b147cc0a4daad6e9"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Unfancy JavaScript"; + homepage = http://coffeescript.org/; + license = "MIT"; + }; + production = true; + }; + cordova = nodeEnv.buildNodePackage { + name = "cordova"; + packageName = "cordova"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz"; + sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776"; + }; + dependencies = [ + (sources."cordova-common-1.5.1" // { + dependencies = [ + sources."q-1.4.1" + sources."underscore-1.8.3" + ]; + }) + (sources."cordova-lib-6.4.0" // { + dependencies = [ + sources."nopt-3.0.6" + sources."semver-4.3.6" + sources."shelljs-0.3.0" + sources."unorm-1.3.3" + ]; + }) + (sources."insight-0.8.3" // { + dependencies = [ + sources."async-1.5.2" + sources."request-2.76.0" + sources."qs-6.3.0" + ]; + }) + sources."nopt-3.0.1" + sources."q-1.0.1" + sources."underscore-1.7.0" + sources."update-notifier-0.5.0" + sources."ansi-0.3.1" + sources."bplist-parser-0.1.1" + sources."cordova-registry-mapper-1.1.15" + sources."elementtree-0.1.6" + sources."glob-5.0.15" + sources."minimatch-3.0.3" + sources."osenv-0.1.3" + sources."plist-1.2.0" + sources."semver-5.3.0" + sources."shelljs-0.5.3" + sources."unorm-1.4.1" + sources."big-integer-1.6.16" + sources."sax-0.3.5" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."base64-js-0.0.8" + sources."xmlbuilder-4.0.0" + sources."xmldom-0.1.22" + sources."util-deprecate-1.0.2" + sources."lodash-3.10.1" + sources."aliasify-1.9.0" + (sources."cordova-fetch-1.0.1" // { + dependencies = [ + sources."q-1.4.1" + sources."shelljs-0.7.5" + sources."glob-7.1.1" + ]; + }) + (sources."cordova-create-1.0.1" // { + dependencies = [ + sources."shelljs-0.3.0" + ]; + }) + sources."cordova-js-4.2.0" + (sources."cordova-serve-1.0.0" // { + dependencies = [ + sources."q-1.4.1" + ]; + }) + (sources."dep-graph-1.1.0" // { + dependencies = [ + sources."underscore-1.2.1" + ]; + }) + (sources."init-package-json-1.9.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + (sources."npm-2.15.11" // { + dependencies = [ + sources."glob-7.0.6" + sources."nopt-3.0.6" + sources."npm-package-arg-4.1.1" + sources."request-2.74.0" + sources."semver-5.1.1" + sources."tar-2.2.1" + sources."form-data-1.0.1" + ]; + }) + sources."opener-1.4.1" + sources."properties-parser-0.2.3" + (sources."request-2.47.0" // { + dependencies = [ + sources."bl-0.9.5" + sources."caseless-0.6.0" + sources."forever-agent-0.5.2" + sources."form-data-0.1.4" + sources."mime-types-1.0.2" + sources."qs-2.3.3" + sources."http-signature-0.10.1" + sources."oauth-sign-0.4.0" + sources."hawk-1.1.1" + sources."aws-sign2-0.5.0" + sources."combined-stream-0.0.7" + sources."readable-stream-1.0.34" + sources."mime-1.2.11" + sources."async-0.9.2" + sources."assert-plus-0.1.5" + sources."asn1-0.1.11" + sources."hoek-0.9.1" + sources."boom-0.4.2" + sources."cryptiles-0.2.2" + sources."sntp-0.2.4" + sources."delayed-stream-0.0.5" + ]; + }) + sources."tar-1.0.2" + sources."valid-identifier-0.0.1" + sources."xcode-0.8.9" + sources."browserify-transform-tools-1.5.3" + sources."falafel-1.2.0" + sources."through-2.3.8" + sources."acorn-1.2.2" + sources."foreach-2.0.5" + sources."isarray-0.0.1" + sources."object-keys-1.0.11" + (sources."dependency-ls-1.0.0" // { + dependencies = [ + sources."q-1.4.1" + ]; + }) + sources."is-url-1.2.2" + sources."interpret-1.0.1" + sources."rechoir-0.6.2" + sources."fs.realpath-1.0.0" + sources."resolve-1.1.7" + sources."cordova-app-hello-world-3.11.0" + sources."browserify-13.1.0" + sources."JSONStream-1.2.1" + sources."assert-1.3.0" + sources."browser-pack-6.0.1" + sources."browser-resolve-1.11.2" + sources."browserify-zlib-0.1.4" + (sources."buffer-4.9.1" // { + dependencies = [ + sources."base64-js-1.2.0" + sources."isarray-1.0.0" + ]; + }) + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.11.0" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + sources."has-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-0.0.1" + sources."insert-module-globals-7.0.1" + sources."labeled-stream-splicer-2.0.0" + sources."module-deps-4.0.8" + sources."os-browserify-0.1.2" + sources."parents-1.0.1" + sources."path-browserify-0.0.0" + sources."process-0.11.9" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.4.1" + sources."string_decoder-0.10.31" + sources."subarg-1.0.0" + (sources."syntax-error-1.1.6" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."xtend-4.0.1" + sources."jsonparse-1.2.0" + sources."combine-source-map-0.7.2" + sources."umd-3.0.1" + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."source-map-0.5.6" + sources."pako-0.2.9" + sources."ieee754-1.1.8" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."date-now-0.1.4" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.0" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.2" + sources."create-hmac-1.1.4" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.9" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.3" + sources."browserify-aes-1.0.6" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.0" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.3.2" + sources."parse-asn1-5.0.0" + sources."brorand-1.0.6" + sources."hash.js-1.0.3" + sources."asn1.js-4.8.1" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.5" + sources."miller-rabin-4.0.0" + sources."function-bind-1.1.0" + sources."is-buffer-1.1.4" + sources."lexical-scope-1.2.0" + sources."astw-2.0.0" + sources."stream-splicer-2.0.0" + sources."cached-path-relative-1.0.0" + (sources."detective-4.3.2" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."stream-combiner2-1.1.1" + sources."path-platform-0.11.15" + sources."buffer-shims-1.0.0" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."builtin-status-codes-2.0.0" + sources."to-arraybuffer-1.0.1" + sources."minimist-1.2.0" + sources."querystring-0.2.0" + sources."indexof-0.0.1" + sources."chalk-1.1.3" + sources."compression-1.6.2" + sources."express-4.14.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."accepts-1.3.3" + sources."bytes-2.3.0" + sources."compressible-2.0.8" + sources."debug-2.2.0" + sources."on-headers-1.0.1" + sources."vary-1.1.0" + sources."mime-types-2.1.12" + sources."negotiator-0.6.1" + sources."mime-db-1.24.0" + sources."ms-0.7.1" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."content-type-1.0.2" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."finalhandler-0.5.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."on-finished-2.3.0" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.2" + sources."qs-6.2.0" + sources."range-parser-1.2.0" + sources."send-0.14.1" + sources."serve-static-1.11.1" + sources."type-is-1.6.13" + sources."utils-merge-1.0.0" + sources."statuses-1.3.0" + sources."unpipe-1.0.0" + sources."ee-first-1.1.1" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.1.1" + sources."destroy-1.0.4" + (sources."http-errors-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."mime-1.3.4" + sources."setprototypeof-1.0.1" + sources."media-typer-0.3.0" + sources."npm-package-arg-4.2.0" + sources."promzard-0.3.0" + sources."read-1.0.7" + (sources."read-package-json-2.0.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-name-2.2.2" + sources."hosted-git-info-2.1.5" + sources."mute-stream-0.0.6" + sources."json-parse-helpfulerror-1.0.3" + sources."normalize-package-data-2.3.5" + sources."graceful-fs-4.1.9" + sources."jju-1.3.0" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."builtins-0.0.7" + sources."abbrev-1.0.9" + sources."ansicolors-0.3.2" + sources."ansistyles-0.1.3" + sources."archy-1.0.0" + sources."async-some-1.0.2" + sources."block-stream-0.0.9" + sources."char-spinner-1.0.1" + sources."chmodr-1.0.2" + sources."chownr-1.0.1" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."config-chain-1.1.11" + sources."dezalgo-1.0.3" + sources."editor-1.0.0" + sources."fs-vacuum-1.2.9" + sources."fs-write-stream-atomic-1.0.8" + sources."fstream-1.0.10" + sources."fstream-npm-1.1.1" + sources."github-url-from-git-1.4.0" + sources."github-url-from-username-repo-1.0.2" + sources."ini-1.3.4" + sources."lockfile-1.0.2" + sources."lru-cache-4.0.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."glob-7.1.1" + sources."tar-2.2.1" + ]; + }) + sources."normalize-git-url-3.0.2" + sources."npm-cache-filename-1.0.2" + sources."npm-install-checks-1.0.7" + (sources."npm-registry-client-7.2.1" // { + dependencies = [ + sources."request-2.76.0" + sources."qs-6.3.0" + ]; + }) + sources."npm-user-validate-0.1.5" + sources."npmlog-2.0.4" + sources."path-is-inside-1.0.2" + sources."read-installed-4.0.3" + sources."realize-package-specifier-3.0.3" + sources."retry-0.10.0" + (sources."rimraf-2.5.4" // { + dependencies = [ + sources."glob-7.1.1" + ]; + }) + sources."sha-2.0.1" + sources."slide-1.1.6" + sources."sorted-object-2.0.1" + sources."text-table-0.2.0" + sources."uid-number-0.0.6" + sources."umask-1.1.0" + sources."which-1.2.11" + sources."write-file-atomic-1.1.4" + sources."imurmurhash-0.1.4" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."proto-list-1.2.4" + sources."asap-2.0.5" + sources."iferr-0.1.5" + sources."fstream-ignore-1.0.5" + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + sources."path-array-1.0.1" + sources."array-index-1.0.0" + sources."es6-symbol-3.1.0" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."debuglog-1.0.1" + sources."readdir-scoped-modules-1.0.2" + sources."util-extend-1.0.3" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + (sources."async-2.1.2" // { + dependencies = [ + sources."lodash-4.16.4" + ]; + }) + sources."isexe-1.1.2" + sources."ctype-0.5.3" + sources."pegjs-0.9.0" + (sources."simple-plist-0.1.4" // { + dependencies = [ + sources."bplist-parser-0.0.6" + ]; + }) + sources."bplist-creator-0.0.4" + sources."stream-buffers-0.2.6" + sources."configstore-1.4.0" + sources."inquirer-0.10.1" + sources."lodash.debounce-3.1.1" + sources."object-assign-4.1.0" + sources."os-name-1.0.3" + sources."uuid-2.0.3" + sources."xdg-basedir-2.0.0" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" + sources."figures-1.7.0" + (sources."readline2-1.0.1" // { + dependencies = [ + sources."mute-stream-0.0.5" + ]; + }) + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."lodash._getnative-3.9.1" + sources."osx-release-1.1.0" + sources."win-release-1.1.1" + sources."is-npm-1.0.0" + sources."latest-version-1.0.1" + sources."repeating-1.1.3" + sources."semver-diff-2.1.0" + sources."string-length-1.0.1" + sources."package-json-1.2.0" + (sources."got-3.3.1" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) + sources."registry-url-3.1.0" + sources."duplexify-3.5.0" + sources."infinity-agent-2.0.3" + sources."is-redirect-1.0.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."nested-error-stacks-1.0.2" + sources."prepend-http-1.0.4" + sources."read-all-stream-3.1.0" + sources."timed-out-2.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."rc-1.1.6" + sources."deep-extend-0.4.1" + sources."strip-json-comments-1.0.4" + sources."is-finite-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Cordova command line interface tool"; + license = "Apache-2.0"; + }; + production = true; + }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.4.tgz"; + sha1 = "0d3907933cc3f04b56960496d573387fbe9bb1e7"; + }; + dependencies = [ + sources."clone-1.0.2" + sources."parserlib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + }; + dnschain = nodeEnv.buildNodePackage { + name = "dnschain"; + packageName = "dnschain"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; + sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; + }; + dependencies = [ + sources."bluebird-2.9.9" + sources."bottleneck-1.5.3" + sources."event-stream-3.2.2" + sources."express-4.11.2" + sources."hiredis-0.4.1" + (sources."json-rpc2-0.8.1" // { + dependencies = [ + sources."debug-1.0.4" + sources."lodash-2.4.2" + sources."ms-0.6.2" + ]; + }) + sources."lodash-3.1.0" + (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { + dependencies = [ + sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" + ]; + }) + sources."native-dns-packet-0.1.1" + sources."nconf-0.7.1" + sources."properties-1.2.1" + sources."redis-0.12.1" + sources."string-2.0.1" + (sources."winston-0.8.0" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + (sources."superagent-0.21.0" // { + dependencies = [ + sources."qs-1.2.0" + sources."methods-1.0.1" + ]; + }) + sources."through-2.3.8" + sources."duplexer-0.1.1" + sources."from-0.1.3" + sources."map-stream-0.1.0" + sources."pause-stream-0.0.11" + sources."split-0.3.3" + sources."stream-combiner-0.0.4" + sources."accepts-1.2.13" + sources."content-disposition-0.5.0" + sources."cookie-signature-1.0.5" + sources."debug-2.1.3" + sources."depd-1.0.1" + sources."escape-html-1.0.1" + sources."etag-1.5.1" + sources."finalhandler-0.3.3" + sources."fresh-0.2.4" + sources."media-typer-0.3.0" + sources."methods-1.1.2" + sources."on-finished-2.2.1" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.3" + sources."proxy-addr-1.0.10" + sources."qs-2.3.3" + sources."range-parser-1.0.3" + sources."send-0.11.1" + sources."serve-static-1.8.1" + (sources."type-is-1.5.7" // { + dependencies = [ + sources."mime-types-2.0.14" + sources."mime-db-1.12.0" + ]; + }) + sources."vary-1.0.1" + sources."cookie-0.1.2" + sources."merge-descriptors-0.0.2" + sources."utils-merge-1.0.0" + sources."mime-types-2.1.12" + sources."negotiator-0.5.3" + sources."mime-db-1.24.0" + sources."ms-0.7.0" + sources."crc-3.2.1" + sources."ee-first-1.1.0" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + sources."destroy-1.0.3" + sources."mime-1.2.11" + sources."bindings-1.2.1" + sources."nan-2.4.0" + sources."jsonparse-0.0.6" + sources."es5class-2.3.1" + sources."faye-websocket-0.11.0" + sources."eventemitter3-0.1.6" + sources."better-curry-1.6.0" + sources."websocket-driver-0.6.5" + sources."websocket-extensions-0.1.1" + (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { + dependencies = [ + sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" + ]; + }) + sources."binaryheap-0.0.3" + sources."buffercursor-0.0.12" + sources."verror-1.8.1" + sources."assert-plus-1.0.0" + sources."core-util-is-1.0.2" + sources."extsprintf-1.3.0" + sources."async-0.9.2" + sources."ini-1.3.4" + sources."optimist-0.6.1" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."colors-0.6.2" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."pkginfo-0.3.1" + sources."stack-trace-0.0.9" + sources."formidable-1.0.14" + sources."component-emitter-1.1.2" + sources."cookiejar-2.0.1" + sources."reduce-component-1.0.1" + sources."extend-1.2.1" + sources."form-data-0.1.3" + sources."readable-stream-1.0.27-1" + sources."combined-stream-0.0.7" + sources."delayed-stream-0.0.5" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; + homepage = https://github.com/okTurtles/dnschain; + license = "MPL-2.0"; + }; + production = true; + }; + docker-registry-server = nodeEnv.buildNodePackage { + name = "docker-registry-server"; + packageName = "docker-registry-server"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz"; + sha1 = "5b98836cd7f0348f7f472f7f5a42dd3cab231731"; + }; + dependencies = [ + sources."JSONStream-0.8.4" + sources."basic-auth-1.0.4" + sources."cookie-signature-1.0.6" + sources."cors-2.8.1" + sources."docker-parse-image-3.0.1" + sources."end-of-stream-1.1.0" + sources."from2-1.3.0" + sources."fs-blob-store-5.2.1" + sources."level-0.18.0" + (sources."level-sublevel-6.6.1" // { + dependencies = [ + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."readable-stream-1.0.34" + ]; + }) + sources."leveldown-0.10.6" + (sources."levelup-0.18.6" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."semver-2.3.2" + sources."xtend-3.0.0" + ]; + }) + sources."lexicographic-integer-1.1.0" + (sources."memdown-0.10.2" // { + dependencies = [ + sources."ltgt-1.0.2" + ]; + }) + sources."minimist-0.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."ndjson-1.4.3" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."pump-1.0.1" + sources."pumpify-1.3.5" + sources."relative-date-1.1.3" + sources."root-2.0.0" + sources."sorted-union-stream-1.0.2" + sources."split2-0.2.1" + sources."stream-collector-1.0.1" + (sources."tar-stream-1.5.2" // { + dependencies = [ + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."readable-stream-2.1.5" + sources."isarray-1.0.0" + ]; + }) + (sources."through2-0.6.5" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) + sources."thunky-0.1.0" + sources."xtend-4.0.1" + sources."jsonparse-0.0.5" + sources."through-2.3.8" + sources."vary-1.1.0" + sources."once-1.3.3" + sources."wrappy-1.0.2" + sources."inherits-2.0.3" + sources."readable-stream-1.1.14" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + (sources."duplexify-3.5.0" // { + dependencies = [ + sources."end-of-stream-1.0.0" + sources."readable-stream-2.1.5" + sources."isarray-1.0.0" + ]; + }) + sources."lru-cache-2.7.3" + sources."stream-shift-1.0.0" + sources."buffer-shims-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."level-packager-0.18.0" + sources."bytewise-1.1.0" + sources."ltgt-2.1.2" + sources."pull-level-2.0.3" + sources."pull-stream-3.4.5" + sources."typewiselite-1.0.0" + sources."bytewise-core-1.2.3" + sources."typewise-1.0.3" + sources."typewise-core-1.2.0" + (sources."bl-0.8.2" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) + sources."deferred-leveldown-0.2.0" + sources."errno-0.1.4" + sources."prr-0.0.0" + sources."semver-5.1.1" + (sources."abstract-leveldown-0.12.4" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."level-post-1.0.5" + sources."pull-cat-1.1.11" + sources."pull-live-1.0.1" + sources."pull-pushable-2.0.1" + sources."pull-window-2.1.4" + (sources."stream-to-pull-stream-1.7.2" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."looper-2.0.0" + sources."bindings-1.2.1" + sources."nan-2.1.0" + sources."murl-0.4.1" + sources."protein-0.5.0" + sources."network-address-0.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "docker registry server implemented in node"; + homepage = https://github.com/mafintosh/docker-registry-server; + license = "MIT"; + }; + production = true; + }; + elasticdump = nodeEnv.buildNodePackage { + name = "elasticdump"; + packageName = "elasticdump"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-2.4.2.tgz"; + sha1 = "757c98aea05ee8714f0de2a33224c4136414633e"; + }; + dependencies = [ + sources."JSONStream-1.1.4" + sources."async-2.0.1" + sources."aws4-1.5.0" + sources."optimist-0.6.1" + sources."request-2.76.0" + sources."jsonparse-1.2.0" + sources."through-2.3.8" + sources."lodash-4.16.4" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "import and export tools for elasticsearch"; + homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; + license = "Apache-2.0"; + }; + production = true; + }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."got-6.5.0" + sources."has-ansi-2.0.0" + sources."lodash.debounce-4.0.8" + sources."log-update-1.0.2" + sources."mem-0.1.1" + sources."meow-3.7.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-2.3.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.1" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."object-assign-4.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."prepend-http-1.0.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; + eslint = nodeEnv.buildNodePackage { + name = "eslint"; + packageName = "eslint"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-3.9.0.tgz"; + sha1 = "68c8fa86b1e0a3f038040f3b5808b7508c128f8e"; + }; + dependencies = [ + sources."babel-code-frame-6.16.0" + sources."chalk-1.1.3" + sources."concat-stream-1.5.2" + sources."debug-2.2.0" + sources."doctrine-1.5.0" + sources."escope-3.6.0" + sources."espree-3.3.2" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."file-entry-cache-2.0.0" + sources."glob-7.1.1" + sources."globals-9.12.0" + sources."ignore-3.2.0" + sources."imurmurhash-0.1.4" + sources."inquirer-0.12.0" + sources."is-my-json-valid-2.15.0" + sources."is-resolvable-1.0.0" + sources."js-yaml-3.6.1" + sources."json-stable-stringify-1.0.1" + sources."levn-0.3.0" + sources."lodash-4.16.4" + sources."mkdirp-0.5.1" + sources."natural-compare-1.4.0" + sources."optionator-0.8.2" + sources."path-is-inside-1.0.2" + sources."pluralize-1.2.1" + sources."progress-1.1.8" + sources."require-uncached-1.0.2" + sources."shelljs-0.7.5" + sources."strip-bom-3.0.0" + sources."strip-json-comments-1.0.4" + (sources."table-3.8.3" // { + dependencies = [ + sources."string-width-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."user-home-2.0.0" + sources."js-tokens-2.0.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."ms-0.7.1" + sources."es6-map-0.1.4" + sources."es6-weak-map-2.0.1" + (sources."esrecurse-4.1.0" // { + dependencies = [ + sources."estraverse-4.1.1" + ]; + }) + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."es6-set-0.1.4" + sources."es6-symbol-3.1.0" + sources."event-emitter-0.3.4" + sources."object-assign-4.1.0" + sources."acorn-4.0.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) + sources."flat-cache-1.2.1" + sources."circular-json-0.3.1" + sources."del-2.2.2" + sources."graceful-fs-4.1.9" + sources."write-0.2.1" + sources."globby-5.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.0" + sources."pify-2.3.0" + sources."pinkie-promise-2.0.1" + sources."rimraf-2.5.4" + sources."array-union-1.0.2" + sources."arrify-1.0.1" + sources."array-uniq-1.0.3" + sources."is-path-inside-1.0.0" + sources."pinkie-2.0.4" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-2.1.0" + sources."figures-1.7.0" + sources."readline2-1.0.1" + sources."run-async-0.1.0" + sources."rx-lite-3.1.2" + sources."string-width-1.0.2" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" + sources."number-is-nan-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."tryit-1.0.3" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + sources."jsonify-0.0.0" + sources."prelude-ls-1.1.2" + sources."type-check-0.3.2" + sources."minimist-0.0.8" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."fast-levenshtein-2.0.5" + sources."caller-path-0.1.0" + sources."resolve-from-1.0.1" + sources."callsites-0.2.0" + sources."interpret-1.0.1" + sources."rechoir-0.6.2" + sources."resolve-1.1.7" + sources."ajv-4.8.2" + sources."ajv-keywords-1.1.1" + sources."slice-ansi-0.0.4" + sources."co-4.6.0" + sources."os-homedir-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An AST-based pattern checker for JavaScript."; + homepage = http://eslint.org/; + license = "MIT"; + }; + production = true; + }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; + sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + homepage = http://www.emojione.com/; + }; + production = true; + }; + fetch-bower = nodeEnv.buildNodePackage { + name = "fetch-bower"; + packageName = "fetch-bower"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; + sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; + }; + dependencies = [ + sources."bower-endpoint-parser-0.2.1" + sources."bower-logger-0.2.1" + sources."bower-1.7.9" + sources."glob-3.2.11" + sources."inherits-2.0.3" + sources."minimatch-0.3.0" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; + homepage = https://bitbucket.org/shlevy/fetch-bower; + }; + production = true; + }; + forever = nodeEnv.buildNodePackage { + name = "forever"; + packageName = "forever"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever/-/forever-0.15.2.tgz"; + sha1 = "fbf21a791ac76bc1a9149a322bc177f338cf5cf9"; + }; + dependencies = [ + (sources."cliff-0.1.10" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) + sources."clone-1.0.2" + sources."colors-0.6.2" + (sources."flatiron-0.4.3" // { + dependencies = [ + sources."optimist-0.6.0" + ]; + }) + sources."forever-monitor-1.6.0" + (sources."nconf-0.6.9" // { + dependencies = [ + sources."async-0.2.9" + sources."optimist-0.6.0" + ]; + }) + sources."nssocket-0.5.3" + sources."object-assign-3.0.0" + sources."optimist-0.6.1" + sources."path-is-absolute-1.0.1" + (sources."prettyjson-1.1.3" // { + dependencies = [ + sources."colors-1.1.2" + sources."minimist-1.2.0" + ]; + }) + (sources."shush-1.0.0" // { + dependencies = [ + sources."strip-json-comments-0.1.3" + ]; + }) + sources."timespan-2.3.0" + sources."utile-0.2.1" + sources."winston-0.8.3" + sources."eyes-0.1.8" + (sources."broadway-0.3.6" // { + dependencies = [ + sources."cliff-0.1.9" + sources."winston-0.8.0" + ]; + }) + sources."prompt-0.2.14" + sources."director-1.2.7" + sources."eventemitter2-0.4.14" + sources."async-0.2.10" + sources."cycle-1.0.3" + sources."pkginfo-0.3.1" + sources."stack-trace-0.0.9" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."read-1.0.7" + sources."revalidator-0.1.8" + sources."mute-stream-0.0.6" + sources."chokidar-1.6.1" + sources."minimatch-2.0.10" + sources."ps-tree-0.0.3" + sources."anymatch-1.3.0" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."inherits-2.0.3" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + (sources."readdirp-2.1.0" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."fsevents-1.0.14" + sources."arrify-1.0.1" + sources."micromatch-2.3.11" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.0" + sources."is-extglob-1.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."isarray-1.0.0" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.7.0" + sources."graceful-fs-4.1.9" + sources."readable-stream-2.1.5" + sources."set-immediate-shim-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."nan-2.4.0" + sources."node-pre-gyp-0.6.31" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.76.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."object-assign-4.1.0" + ]; + }) + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + (sources."glob-7.1.1" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."debug-2.2.0" + (sources."fstream-ignore-1.0.5" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."uid-number-0.0.6" + sources."ms-0.7.1" + (sources."event-stream-0.5.3" // { + dependencies = [ + sources."optimist-0.2.8" + ]; + }) + sources."lazy-1.0.11" + sources."caller-0.0.1" + sources."tape-2.3.3" + sources."jsonify-0.0.0" + sources."deep-equal-0.1.2" + sources."defined-0.0.0" + sources."through-2.3.8" + sources."resumer-0.0.0" + sources."i-0.3.5" + sources."ncp-0.4.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; + homepage = "https://github.com/foreverjs/forever#readme"; + license = "MIT"; + }; + production = true; + }; + git-run = nodeEnv.buildNodePackage { + name = "git-run"; + packageName = "git-run"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.2.tgz"; + sha1 = "1edbc7163389067dd9f2c46ab3acff07889f8333"; + }; + dependencies = [ + sources."minilog-2.0.8" + sources."tabtab-git+https://github.com/mixu/node-tabtab.git" + sources."microee-0.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A tool for managing multiple git repositories"; + homepage = "https://github.com/mixu/gr#readme"; + license = "BSD-3-Clause"; + }; + production = true; + }; + grunt-cli = nodeEnv.buildNodePackage { + name = "grunt-cli"; + packageName = "grunt-cli"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"; + sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; + }; + dependencies = [ + sources."findup-sync-0.3.0" + sources."grunt-known-options-1.1.0" + sources."nopt-3.0.6" + sources."resolve-1.1.7" + sources."glob-5.0.15" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."abbrev-1.0.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The grunt command line interface"; + homepage = "https://github.com/gruntjs/grunt-cli#readme"; + license = "MIT"; + }; + production = true; + }; + "guifi-earth-https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " = nodeEnv.buildNodePackage { + name = "guifi-earth"; + packageName = "guifi-earth"; + version = "0.2.1"; + src = fetchurl { + name = "guifi-earth-0.2.1.tar.gz"; + url = https://codeload.github.com/jmendeth/guifi-earth/legacy.tar.gz/f3ee96835fd4fb0e3e12fadbd2cb782770d64854; + sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; + }; + dependencies = [ + sources."coffee-script-1.11.1" + sources."jade-1.11.0" + (sources."q-2.0.3" // { + dependencies = [ + sources."asap-2.0.5" + ]; + }) + sources."xml2js-0.4.17" + sources."msgpack-1.0.2" + sources."character-parser-1.2.1" + (sources."clean-css-3.4.20" // { + dependencies = [ + sources."commander-2.8.1" + ]; + }) + sources."commander-2.6.0" + sources."constantinople-3.0.2" + sources."jstransformer-0.0.2" + sources."mkdirp-0.5.1" + (sources."transformers-2.1.0" // { + dependencies = [ + sources."promise-2.0.0" + sources."uglify-js-2.2.5" + sources."is-promise-1.0.1" + sources."source-map-0.1.43" + ]; + }) + (sources."uglify-js-2.7.4" // { + dependencies = [ + sources."source-map-0.5.6" + ]; + }) + sources."void-elements-2.0.1" + (sources."with-4.0.3" // { + dependencies = [ + sources."acorn-1.2.2" + ]; + }) + sources."source-map-0.4.4" + sources."graceful-readlink-1.0.1" + sources."amdefine-1.0.0" + sources."acorn-2.7.0" + sources."is-promise-2.1.0" + sources."promise-6.1.0" + sources."asap-1.0.0" + sources."minimist-0.0.8" + sources."css-1.0.8" + sources."css-parse-1.0.4" + sources."css-stringify-1.0.5" + sources."optimist-0.3.7" + sources."wordwrap-0.0.3" + sources."async-0.2.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."acorn-globals-1.0.9" + sources."pop-iterate-1.0.1" + sources."weak-map-1.0.5" + sources."sax-1.2.1" + sources."xmlbuilder-4.2.1" + sources."lodash-4.16.4" + sources."nan-2.4.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "See a representation of the Guifi.net network in Google Earth."; + homepage = https://github.com/jmendeth/guifi-earth; + }; + production = true; + }; + gulp = nodeEnv.buildNodePackage { + name = "gulp"; + packageName = "gulp"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; + }; + dependencies = [ + sources."archy-1.0.0" + sources."chalk-1.1.3" + sources."deprecated-0.0.1" + sources."gulp-util-3.0.7" + sources."interpret-1.0.1" + sources."liftoff-2.3.0" + sources."minimist-1.2.0" + sources."orchestrator-0.3.7" + sources."pretty-hrtime-1.0.2" + sources."semver-4.3.6" + sources."tildify-1.2.0" + sources."v8flags-2.0.11" + (sources."vinyl-fs-0.3.14" // { + dependencies = [ + sources."graceful-fs-3.0.11" + sources."strip-bom-1.0.0" + sources."through2-0.6.5" + sources."vinyl-0.4.6" + sources."readable-stream-1.0.34" + sources."clone-0.2.0" + ]; + }) + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."array-differ-1.0.0" + sources."array-uniq-1.0.3" + sources."beeper-1.1.0" + sources."dateformat-1.0.12" + sources."fancy-log-1.2.0" + sources."gulplog-1.0.0" + sources."has-gulplog-0.1.0" + sources."lodash._reescape-3.0.0" + sources."lodash._reevaluate-3.0.0" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-3.6.2" + sources."multipipe-0.1.2" + sources."object-assign-3.0.0" + sources."replace-ext-0.0.1" + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."vinyl-0.5.3" + sources."get-stdin-4.0.1" + (sources."meow-3.7.0" // { + dependencies = [ + sources."object-assign-4.1.0" + ]; + }) + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."normalize-package-data-2.3.5" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."time-stamp-1.0.1" + sources."glogg-1.0.0" + sources."sparkles-1.0.0" + sources."lodash._basecopy-3.0.1" + sources."lodash._basetostring-3.0.1" + sources."lodash._basevalues-3.0.0" + sources."lodash._isiterateecall-3.0.9" + sources."lodash.escape-3.2.0" + sources."lodash.keys-3.1.2" + sources."lodash.restparam-3.6.1" + sources."lodash.templatesettings-3.1.1" + sources."lodash._root-3.0.1" + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."duplexer2-0.0.2" + sources."readable-stream-1.1.14" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + sources."xtend-4.0.1" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."clone-1.0.2" + sources."clone-stats-0.0.1" + sources."extend-3.0.0" + sources."findup-sync-0.4.3" + sources."fined-1.0.2" + sources."flagged-respawn-0.3.2" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.mapvalues-4.6.0" + sources."rechoir-0.6.2" + sources."resolve-1.1.7" + sources."detect-file-0.1.0" + sources."is-glob-2.0.1" + sources."micromatch-2.3.11" + sources."resolve-dir-0.1.1" + sources."fs-exists-sync-0.1.0" + sources."is-extglob-1.0.0" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + (sources."isobject-2.1.0" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."glob-parent-2.0.0" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."expand-tilde-1.2.2" + sources."global-modules-0.2.3" + sources."os-homedir-1.0.2" + sources."global-prefix-0.1.4" + sources."is-windows-0.2.0" + sources."ini-1.3.4" + sources."osenv-0.1.3" + sources."which-1.2.11" + sources."os-tmpdir-1.0.2" + sources."isexe-1.1.2" + sources."lodash.assignwith-4.2.0" + sources."lodash.isempty-4.4.0" + sources."lodash.pick-4.4.0" + sources."parse-filepath-1.0.1" + sources."is-absolute-0.2.6" + sources."map-cache-0.2.2" + sources."path-root-0.1.1" + sources."is-relative-0.2.1" + sources."is-unc-path-0.1.1" + sources."unc-path-regex-0.1.2" + sources."path-root-regex-0.1.2" + sources."end-of-stream-0.1.5" + sources."sequencify-0.0.7" + sources."stream-consume-0.1.0" + sources."once-1.3.3" + sources."wrappy-1.0.2" + sources."user-home-1.1.1" + sources."defaults-1.0.3" + (sources."glob-stream-3.1.18" // { + dependencies = [ + sources."through2-0.6.5" + sources."readable-stream-1.0.34" + ]; + }) + sources."glob-watcher-0.0.6" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."glob-4.5.3" + sources."minimatch-2.0.10" + sources."ordered-read-streams-0.1.0" + sources."glob2base-0.0.12" + sources."unique-stream-1.0.0" + sources."inflight-1.0.6" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."find-index-0.1.1" + sources."gaze-0.5.2" + (sources."globule-0.1.0" // { + dependencies = [ + sources."glob-3.1.21" + sources."minimatch-0.2.14" + sources."graceful-fs-1.2.3" + sources."inherits-1.0.2" + ]; + }) + sources."lodash-1.0.2" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."natives-1.1.0" + sources."first-chunk-stream-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "The streaming build system"; + homepage = http://gulpjs.com/; + license = "MIT"; + }; + production = true; + }; + hipache = nodeEnv.buildNodePackage { + name = "hipache"; + packageName = "hipache"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz"; + sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; + }; + dependencies = [ + sources."http-proxy-1.0.2" + sources."redis-0.10.3" + sources."lru-cache-2.5.2" + sources."minimist-0.0.8" + sources."eventemitter3-2.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Complete high-scaled reverse-proxy solution"; + homepage = https://github.com/dotcloud/hipache; + license = "MIT"; + }; + production = true; + }; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.0.3" + sources."commander-2.6.0" + sources."csslint-0.10.0" + sources."glob-5.0.15" + (sources."jshint-2.8.0" // { + dependencies = [ + sources."minimatch-2.0.10" + ]; + }) + sources."parse-glob-3.0.4" + sources."strip-json-comments-1.0.4" + sources."xml-1.0.0" + sources."parserlib-0.2.5" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."cli-0.6.6" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) + sources."console-browserify-1.1.0" + sources."exit-0.1.2" + sources."htmlparser2-3.8.3" + sources."shelljs-0.3.0" + sources."lodash-3.7.0" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."date-now-0.1.4" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."domelementtype-1.3.0" + sources."readable-stream-1.1.14" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."glob-parent-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; + license = "MIT"; + }; + production = true; + }; + istanbul = nodeEnv.buildNodePackage { + name = "istanbul"; + packageName = "istanbul"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz"; + sha1 = "65c7d73d4c4da84d4f3ac310b918fb0b8033733b"; + }; + dependencies = [ + sources."abbrev-1.0.9" + sources."async-1.5.2" + sources."escodegen-1.8.1" + sources."esprima-2.7.3" + sources."glob-5.0.15" + (sources."handlebars-4.0.5" // { + dependencies = [ + sources."source-map-0.4.4" + ]; + }) + sources."js-yaml-3.6.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."nopt-3.0.6" + sources."once-1.4.0" + sources."resolve-1.1.7" + sources."supports-color-3.1.2" + sources."which-1.2.11" + sources."wordwrap-1.0.0" + sources."estraverse-1.9.3" + sources."esutils-2.0.2" + sources."optionator-0.8.2" + sources."source-map-0.2.0" + sources."prelude-ls-1.1.2" + sources."deep-is-0.1.3" + sources."type-check-0.3.2" + sources."levn-0.3.0" + sources."fast-levenshtein-2.0.5" + sources."amdefine-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + ]; + }) + (sources."uglify-js-2.7.4" // { + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.5.6" + ]; + }) + sources."minimist-0.0.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."argparse-1.0.9" + sources."sprintf-js-1.0.3" + sources."has-flag-1.0.0" + sources."isexe-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; + homepage = "https://github.com/gotwarlost/istanbul#readme"; + license = "BSD-3-Clause"; + }; + production = true; + }; + jayschema = nodeEnv.buildNodePackage { + name = "jayschema"; + packageName = "jayschema"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; + sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + }; + dependencies = [ + sources."when-3.4.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A comprehensive JSON Schema validator for Node.js"; + homepage = https://github.com/natesilva/jayschema; + license = "BSD-3-Clause"; + }; + production = true; + }; + jshint = nodeEnv.buildNodePackage { + name = "jshint"; + packageName = "jshint"; + version = "2.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz"; + sha1 = "5e3ba97848d5290273db514aee47fe24cf592934"; + }; + dependencies = [ + sources."cli-1.0.1" + sources."console-browserify-1.1.0" + sources."exit-0.1.2" + sources."htmlparser2-3.8.3" + sources."minimatch-3.0.3" + sources."shelljs-0.3.0" + sources."strip-json-comments-1.0.4" + sources."lodash-3.7.0" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."date-now-0.1.4" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."domelementtype-1.3.0" + sources."readable-stream-1.1.14" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Static analysis tool for JavaScript"; + homepage = http://jshint.com/; + license = "(MIT AND JSON)"; + }; + production = true; + }; + json = nodeEnv.buildNodePackage { + name = "json"; + packageName = "json"; + version = "9.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; + sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a 'json' command for massaging and processing JSON on the command line"; + homepage = https://github.com/trentm/json; + }; + production = true; + }; + jsontool = nodeEnv.buildNodePackage { + name = "jsontool"; + packageName = "jsontool"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; + sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a 'json' command for massaging JSON on the command line"; + homepage = https://github.com/trentm/json; + }; + production = true; + }; + js-yaml = nodeEnv.buildNodePackage { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; + sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; + }; + dependencies = [ + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "YAML 1.2 parser and serializer"; + homepage = https://github.com/nodeca/js-yaml; + license = "MIT"; + }; + production = true; + }; + karma = nodeEnv.buildNodePackage { + name = "karma"; + packageName = "karma"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; + }; + dependencies = [ + sources."bluebird-3.4.6" + sources."body-parser-1.15.2" + sources."chokidar-1.6.1" + sources."colors-1.1.2" + (sources."combine-lists-1.0.1" // { + dependencies = [ + sources."lodash-4.16.4" + ]; + }) + sources."connect-3.5.0" + sources."core-js-2.4.1" + sources."di-0.0.1" + sources."dom-serialize-2.2.1" + (sources."expand-braces-0.1.2" // { + dependencies = [ + sources."braces-0.1.5" + sources."expand-range-0.1.1" + sources."is-number-0.1.1" + sources."repeat-string-0.2.2" + ]; + }) + sources."glob-7.1.1" + sources."graceful-fs-4.1.9" + sources."http-proxy-1.15.2" + sources."isbinaryfile-3.0.1" + sources."lodash-3.10.1" + (sources."log4js-0.6.38" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."semver-4.3.6" + sources."isarray-0.0.1" + ]; + }) + sources."mime-1.3.4" + sources."minimatch-3.0.3" + sources."optimist-0.6.1" + sources."qjobs-1.1.5" + sources."range-parser-1.2.0" + sources."rimraf-2.5.4" + sources."socket.io-1.4.7" + sources."source-map-0.5.6" + sources."tmp-0.0.28" + sources."useragent-2.1.9" + sources."bytes-2.4.0" + sources."content-type-1.0.2" + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."http-errors-1.5.0" + sources."iconv-lite-0.4.13" + sources."on-finished-2.3.0" + sources."qs-6.2.0" + sources."raw-body-2.1.7" + sources."type-is-1.6.13" + sources."ms-0.7.1" + sources."inherits-2.0.1" + sources."setprototypeof-1.0.1" + sources."statuses-1.3.0" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" + sources."anymatch-1.3.0" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."path-is-absolute-1.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.0.14" + sources."arrify-1.0.1" + sources."micromatch-2.3.11" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.0" + sources."is-extglob-1.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."isarray-1.0.0" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.7.0" + sources."readable-stream-2.1.5" + sources."set-immediate-shim-1.0.1" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."nan-2.4.0" + sources."node-pre-gyp-0.6.31" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."request-2.76.0" // { + dependencies = [ + sources."qs-6.3.0" + ]; + }) + sources."semver-5.3.0" + sources."tar-2.2.1" + sources."tar-pack-3.3.0" + sources."minimist-0.0.8" + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."fstream-ignore-1.0.5" + sources."once-1.3.3" + sources."uid-number-0.0.6" + sources."wrappy-1.0.2" + sources."finalhandler-0.5.0" + sources."parseurl-1.3.1" + sources."utils-merge-1.0.0" + sources."escape-html-1.0.3" + sources."custom-event-1.0.1" + sources."ent-2.2.0" + sources."void-elements-2.0.1" + sources."array-slice-0.2.3" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."eventemitter3-1.2.0" + sources."requires-port-1.0.0" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."wordwrap-0.0.3" + sources."engine.io-1.6.10" + (sources."socket.io-parser-2.2.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + (sources."socket.io-client-1.4.6" // { + dependencies = [ + sources."component-emitter-1.2.0" + ]; + }) + (sources."socket.io-adapter-0.4.0" // { + dependencies = [ + (sources."socket.io-parser-2.2.2" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."json3-3.2.6" + sources."isarray-0.0.1" + ]; + }) + (sources."has-binary-0.1.7" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."base64id-0.1.0" + sources."ws-1.0.1" + (sources."engine.io-parser-1.2.4" // { + dependencies = [ + sources."has-binary-0.1.6" + sources."isarray-0.0.1" + ]; + }) + (sources."accepts-1.1.4" // { + dependencies = [ + sources."mime-types-2.0.14" + sources."mime-db-1.12.0" + ]; + }) + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.2" + sources."blob-0.0.4" + sources."utf8-2.1.0" + sources."negotiator-0.4.9" + sources."json3-3.3.2" + sources."component-emitter-1.1.2" + sources."benchmark-1.0.0" + sources."engine.io-client-1.6.9" + sources."component-bind-1.0.0" + sources."object-component-0.0.3" + sources."indexof-0.0.1" + sources."parseuri-0.0.4" + sources."to-array-0.1.4" + sources."backo2-1.0.2" + sources."has-cors-1.1.0" + sources."xmlhttprequest-ssl-1.5.1" + sources."parsejson-0.0.1" + sources."parseqs-0.0.2" + sources."component-inherit-0.0.3" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + sources."os-tmpdir-1.0.2" + sources."lru-cache-2.2.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Spectacular Test Runner for JavaScript."; + homepage = http://karma-runner.github.io/; + license = "MIT"; + }; + production = true; + }; + "kibana-authentication-proxy-git://github.com/fangli/kibana-authentication-proxy.git" = nodeEnv.buildNodePackage { + name = "kibana-authentication-proxy"; + packageName = "kibana-authentication-proxy"; + version = "1.1.0"; + src = fetchgit { + url = "git://github.com/fangli/kibana-authentication-proxy.git"; + rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3"; + sha256 = "a282e834ff67715017f299468ff0d7e496d2bc0f1f7b075b557568b7feb3dba7"; + }; + dependencies = [ + sources."express-3.21.2" + (sources."passport-0.3.2" // { + dependencies = [ + sources."pause-0.0.1" + ]; + }) + sources."passport-google-oauth-1.0.0" + sources."connect-restreamer-1.0.3" + sources."xml2js-0.4.17" + sources."basic-auth-1.0.4" + sources."connect-2.30.2" + sources."content-disposition-0.5.0" + sources."content-type-1.0.2" + sources."commander-2.6.0" + sources."cookie-0.1.3" + sources."cookie-signature-1.0.6" + sources."debug-2.2.0" + sources."depd-1.0.1" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.0" + sources."methods-1.1.2" + sources."mkdirp-0.5.1" + sources."parseurl-1.3.1" + sources."proxy-addr-1.0.10" + sources."range-parser-1.0.3" + (sources."send-0.13.0" // { + dependencies = [ + sources."destroy-1.0.3" + sources."statuses-1.2.1" + ]; + }) + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + sources."basic-auth-connect-1.0.0" + sources."body-parser-1.13.3" + sources."bytes-2.1.0" + sources."cookie-parser-1.3.5" + sources."compression-1.5.2" + sources."connect-timeout-1.6.2" + sources."csurf-1.8.3" + (sources."errorhandler-1.4.3" // { + dependencies = [ + sources."accepts-1.3.3" + sources."escape-html-1.0.3" + sources."negotiator-0.6.1" + ]; + }) + (sources."express-session-1.11.3" // { + dependencies = [ + sources."uid-safe-2.0.0" + sources."base64-url-1.2.1" + ]; + }) + sources."finalhandler-0.4.0" + sources."http-errors-1.3.1" + (sources."method-override-2.3.6" // { + dependencies = [ + sources."vary-1.1.0" + ]; + }) + sources."morgan-1.6.1" + sources."multiparty-3.3.2" + sources."on-headers-1.0.1" + sources."pause-0.1.0" + sources."qs-4.0.0" + sources."response-time-2.3.1" + sources."serve-favicon-2.3.0" + (sources."serve-index-1.7.3" // { + dependencies = [ + sources."escape-html-1.0.3" + ]; + }) + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."escape-html-1.0.3" + sources."send-0.13.2" + sources."depd-1.1.0" + sources."statuses-1.2.1" + ]; + }) + sources."type-is-1.6.13" + sources."vhost-3.0.2" + sources."iconv-lite-0.4.11" + sources."on-finished-2.3.0" + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + ]; + }) + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."accepts-1.2.13" + sources."compressible-2.0.8" + sources."mime-types-2.1.12" + sources."negotiator-0.5.3" + sources."mime-db-1.24.0" + sources."ms-0.7.1" + sources."csrf-3.0.3" + sources."base64-url-1.2.2" + sources."rndm-1.2.0" + sources."tsscmp-1.0.5" + sources."uid-safe-2.1.1" + sources."random-bytes-1.0.0" + sources."crc-3.3.0" + sources."inherits-2.0.3" + sources."statuses-1.3.0" + sources."readable-stream-1.1.14" + sources."stream-counter-0.2.0" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."batch-0.5.3" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."media-typer-0.3.0" + sources."minimist-0.0.8" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + sources."passport-strategy-1.0.0" + sources."passport-google-oauth1-1.0.0" + sources."passport-google-oauth20-1.0.0" + sources."passport-oauth1-1.1.0" + sources."oauth-0.9.14" + sources."passport-oauth2-1.3.0" + sources."uid2-0.0.3" + sources."sax-1.2.1" + sources."xmlbuilder-4.2.1" + sources."lodash-4.16.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; + license = "MIT"; + }; + production = true; + }; + lcov-result-merger = nodeEnv.buildNodePackage { + name = "lcov-result-merger"; + packageName = "lcov-result-merger"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.2.0.tgz"; + sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; + }; + dependencies = [ + sources."through2-2.0.1" + sources."vinyl-1.2.0" + sources."vinyl-fs-2.4.4" + sources."readable-stream-2.0.6" + sources."xtend-4.0.1" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."clone-1.0.2" + sources."clone-stats-0.0.1" + sources."replace-ext-0.0.1" + sources."duplexify-3.5.0" + (sources."glob-stream-5.3.5" // { + dependencies = [ + sources."through2-0.6.5" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + sources."graceful-fs-4.1.9" + sources."gulp-sourcemaps-1.6.0" + sources."is-valid-glob-0.3.0" + sources."lazystream-1.0.0" + sources."lodash.isequal-4.4.0" + sources."merge-stream-1.0.0" + sources."mkdirp-0.5.1" + sources."object-assign-4.1.0" + sources."strip-bom-2.0.0" + sources."strip-bom-stream-1.0.0" + sources."through2-filter-2.0.0" + sources."vali-date-1.0.0" + sources."end-of-stream-1.0.0" + sources."stream-shift-1.0.0" + sources."once-1.3.3" + sources."wrappy-1.0.2" + sources."extend-3.0.0" + sources."glob-5.0.15" + sources."glob-parent-3.0.1" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."ordered-read-streams-0.3.0" + sources."to-absolute-glob-0.1.1" + sources."unique-stream-2.2.1" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."is-glob-3.1.0" + sources."path-dirname-1.0.2" + sources."is-extglob-2.1.0" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) + sources."filename-regex-2.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-glob-2.0.1" + sources."is-extglob-1.0.0" + ]; + }) + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."is-stream-1.1.0" + sources."extend-shallow-2.0.1" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" + sources."convert-source-map-1.3.0" + sources."minimist-0.0.8" + sources."is-utf8-0.2.1" + sources."first-chunk-stream-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Merges multiple lcov results into one"; + homepage = https://github.com/mweibel/lcov-result-merger; + license = "MIT"; + }; + production = true; + }; + meat = nodeEnv.buildNodePackage { + name = "meat"; + packageName = "meat"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz"; + sha1 = "e2b6b721014096e30de9c97114e1dd6696135d13"; + }; + dependencies = [ + sources."express-2.5.11" + sources."jade-0.27.0" + sources."open-0.0.2" + sources."winston-0.6.2" + sources."mkdirp-0.3.0" + sources."node.extend-1.0.0" + sources."connect-1.9.2" + sources."mime-1.2.4" + sources."qs-0.4.2" + sources."formidable-1.0.17" + sources."commander-0.6.1" + sources."async-0.1.22" + sources."colors-0.6.2" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."pkginfo-0.2.3" + sources."request-2.9.203" + sources."stack-trace-0.0.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; + homepage = https://bitbucket.org/aahmed/meat; + }; + production = true; + }; + nijs = nodeEnv.buildNodePackage { + name = "nijs"; + packageName = "nijs"; + version = "0.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz"; + sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; + }; + dependencies = [ + sources."optparse-1.0.5" + sources."slasp-0.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "An internal DSL for the Nix package manager in JavaScript"; + homepage = https://github.com/svanderburg/nijs; + license = "MIT"; + }; + production = true; + }; + node2nix = nodeEnv.buildNodePackage { + name = "node2nix"; + packageName = "node2nix"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; + }; + dependencies = [ + sources."optparse-1.0.5" + sources."semver-5.0.3" + sources."npm-registry-client-7.1.2" + (sources."npmconf-2.0.9" // { + dependencies = [ + sources."once-1.3.3" + sources."semver-4.3.6" + ]; + }) + sources."tar-1.0.3" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + (sources."fs.extra-1.2.1" // { + dependencies = [ + sources."mkdirp-0.3.5" + ]; + }) + sources."findit-2.0.0" + sources."slasp-0.0.4" + sources."nijs-0.0.23" + sources."chownr-1.0.1" + sources."concat-stream-1.5.2" + sources."graceful-fs-4.1.9" + sources."mkdirp-0.5.1" + sources."normalize-package-data-2.3.5" + (sources."npm-package-arg-4.2.0" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."once-1.4.0" + sources."request-2.76.0" + sources."retry-0.8.0" + sources."rimraf-2.5.4" + sources."slide-1.1.6" + sources."npmlog-3.1.2" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."minimist-0.0.8" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."wrappy-1.0.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."config-chain-1.1.11" + sources."ini-1.3.4" + sources."nopt-3.0.6" + sources."osenv-0.1.3" + sources."uid-number-0.0.5" + sources."proto-list-1.2.4" + sources."abbrev-1.0.9" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + (sources."fs-extra-0.6.4" // { + dependencies = [ + sources."mkdirp-0.3.5" + sources."rimraf-2.2.8" + ]; + }) + sources."walk-2.2.1" + sources."ncp-0.4.2" + sources."jsonfile-1.0.1" + sources."forEachAsync-2.2.1" + sources."sequence-2.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate Nix expressions to build NPM packages"; + homepage = https://github.com/svanderburg/node2nix; + }; + production = true; + }; + node-gyp = nodeEnv.buildNodePackage { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; + sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + }; + dependencies = [ + sources."fstream-1.0.10" + sources."glob-7.1.1" + sources."graceful-fs-4.1.9" + sources."minimatch-3.0.3" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-3.1.2" + sources."osenv-0.1.3" + sources."path-array-1.0.1" + sources."request-2.76.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."tar-2.2.1" + sources."which-1.2.11" + sources."inherits-2.0.3" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."array-index-1.0.0" + sources."debug-2.2.0" + sources."es6-symbol-3.1.0" + sources."ms-0.7.1" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."isexe-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon build tool"; + homepage = "https://github.com/nodejs/node-gyp#readme"; + license = "MIT"; + }; + production = true; + }; + node-inspector = nodeEnv.buildNodePackage { + name = "node-inspector"; + packageName = "node-inspector"; + version = "0.12.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz"; + sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f"; + }; + dependencies = [ + sources."async-0.9.2" + sources."biased-opener-0.2.8" + sources."debug-2.2.0" + sources."express-4.14.0" + sources."glob-5.0.15" + sources."path-is-absolute-1.0.1" + sources."rc-1.1.6" + sources."semver-4.3.6" + sources."serve-favicon-2.3.0" + sources."strong-data-uri-1.0.4" + sources."v8-debug-0.7.7" + sources."v8-profiler-5.6.5" + sources."which-1.2.11" + sources."ws-1.1.1" + sources."yargs-3.32.0" + sources."browser-launcher2-0.4.6" + sources."minimist-1.2.0" + sources."x-default-browser-0.3.1" + sources."headless-0.1.7" + sources."lodash-2.4.2" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."osenv-0.1.3" + sources."plist-1.2.0" + (sources."win-detect-browsers-1.0.2" // { + dependencies = [ + sources."yargs-1.3.3" + ]; + }) + sources."uid-0.0.2" + sources."rimraf-2.2.8" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."base64-js-0.0.8" + (sources."xmlbuilder-4.0.0" // { + dependencies = [ + sources."lodash-3.10.1" + ]; + }) + sources."xmldom-0.1.22" + sources."util-deprecate-1.0.2" + sources."after-0.8.2" + sources."xtend-4.0.1" + sources."default-browser-id-1.0.4" + sources."bplist-parser-0.1.1" + sources."meow-3.7.0" + sources."untildify-2.1.0" + sources."big-integer-1.6.16" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."normalize-package-data-2.3.5" + sources."object-assign-4.1.0" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + sources."ms-0.7.1" + sources."accepts-1.3.3" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."content-type-1.0.2" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."finalhandler-0.5.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."on-finished-2.3.0" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.2" + sources."qs-6.2.0" + sources."range-parser-1.2.0" + sources."send-0.14.1" + sources."serve-static-1.11.1" + sources."type-is-1.6.13" + sources."utils-merge-1.0.0" + sources."vary-1.1.0" + sources."mime-types-2.1.12" + sources."negotiator-0.6.1" + sources."mime-db-1.24.0" + sources."statuses-1.3.0" + sources."unpipe-1.0.0" + sources."ee-first-1.1.1" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.1.1" + sources."destroy-1.0.4" + sources."http-errors-1.5.0" + sources."mime-1.3.4" + sources."inherits-2.0.1" + sources."setprototypeof-1.0.1" + sources."media-typer-0.3.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."truncate-1.0.5" + sources."nan-2.4.0" + (sources."node-pre-gyp-0.6.31" // { + dependencies = [ + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."glob-7.1.1" + ]; + }) + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."request-2.76.0" // { + dependencies = [ + sources."qs-6.3.0" + ]; + }) + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + sources."rimraf-2.5.4" + sources."glob-7.1.1" + ]; + }) + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."ansi-regex-2.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."is-property-1.0.2" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."fs.realpath-1.0.0" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."isexe-1.1.2" + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."cliui-3.2.0" + sources."os-locale-1.4.0" + sources."window-size-0.1.4" + sources."y18n-3.2.1" + sources."wrap-ansi-2.0.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Web Inspector based nodeJS debugger"; + homepage = http://github.com/node-inspector/node-inspector; + }; + production = true; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.31"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz"; + sha1 = "d8a00ddaa301a940615dbcc8caad4024d58f6017"; + }; + dependencies = [ + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.76.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."minimist-0.0.8" + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."graceful-fs-4.1.9" + sources."debug-2.2.0" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."ms-0.7.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + }; + nodemon = nodeEnv.buildNodePackage { + name = "nodemon"; + packageName = "nodemon"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.11.0.tgz"; + sha1 = "226c562bd2a7b13d3d7518b49ad4828a3623d06c"; + }; + dependencies = [ + sources."chokidar-1.6.1" + sources."debug-2.2.0" + sources."es6-promise-3.3.1" + sources."ignore-by-default-1.0.1" + sources."lodash.defaults-3.1.2" + sources."minimatch-3.0.3" + sources."ps-tree-1.1.0" + (sources."touch-1.0.0" // { + dependencies = [ + sources."nopt-1.0.10" + ]; + }) + sources."undefsafe-0.0.3" + sources."update-notifier-0.5.0" + sources."anymatch-1.3.0" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."inherits-2.0.3" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."path-is-absolute-1.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.0.14" + sources."arrify-1.0.1" + sources."micromatch-2.3.11" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.0" + sources."is-extglob-1.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."isarray-1.0.0" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.7.0" + sources."graceful-fs-4.1.9" + sources."readable-stream-2.1.5" + sources."set-immediate-shim-1.0.1" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."nan-2.4.0" + sources."node-pre-gyp-0.6.31" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.76.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."minimist-0.0.8" + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."ms-0.7.1" + sources."lodash.assign-3.2.0" + sources."lodash.restparam-3.6.1" + sources."lodash._baseassign-3.2.0" + sources."lodash._createassigner-3.1.1" + sources."lodash.keys-3.1.2" + sources."lodash._basecopy-3.0.1" + sources."lodash._bindcallback-3.0.1" + sources."lodash._isiterateecall-3.0.9" + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."event-stream-3.3.4" + sources."through-2.3.8" + sources."duplexer-0.1.1" + sources."from-0.1.3" + sources."map-stream-0.1.0" + sources."pause-stream-0.0.11" + sources."split-0.3.3" + sources."stream-combiner-0.0.4" + sources."configstore-1.4.0" + sources."is-npm-1.0.0" + sources."latest-version-1.0.1" + sources."repeating-1.1.3" + sources."semver-diff-2.1.0" + sources."string-length-1.0.1" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.3" + sources."uuid-2.0.3" + sources."write-file-atomic-1.2.0" + sources."xdg-basedir-2.0.0" + sources."os-homedir-1.0.2" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + sources."package-json-1.2.0" + (sources."got-3.3.1" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) + sources."registry-url-3.1.0" + sources."duplexify-3.5.0" + sources."infinity-agent-2.0.3" + sources."is-redirect-1.0.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."nested-error-stacks-1.0.2" + sources."prepend-http-1.0.4" + sources."read-all-stream-3.1.0" + sources."timed-out-2.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."is-finite-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Simple monitor script for use during development of a node.js app."; + homepage = http://nodemon.io/; + license = "MIT"; + }; + production = true; + }; + node-red = nodeEnv.buildNodePackage { + name = "node-red"; + packageName = "node-red"; + version = "0.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red/-/node-red-0.15.2.tgz"; + sha1 = "4533dd93f63828f8e749f0c132a793fbeb636ea6"; + }; + dependencies = [ + sources."basic-auth-1.0.4" + sources."bcryptjs-2.3.0" + sources."body-parser-1.15.2" + sources."cheerio-0.22.0" + sources."clone-2.0.0" + sources."cookie-parser-1.4.3" + sources."cors-2.8.1" + sources."cron-1.1.1" + sources."express-4.14.0" + sources."follow-redirects-0.2.0" + sources."fs-extra-0.30.0" + sources."fs.notify-0.0.4" + sources."i18next-1.10.6" + sources."is-utf8-0.2.1" + sources."media-typer-0.3.0" + (sources."mqtt-1.14.1" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + sources."mustache-2.2.1" + sources."nopt-3.0.6" + sources."oauth2orize-1.5.0" + sources."on-headers-1.0.1" + sources."passport-0.3.2" + sources."passport-http-bearer-1.0.1" + sources."passport-oauth2-client-password-0.1.2" + sources."raw-body-2.1.7" + sources."semver-5.3.0" + sources."sentiment-1.0.6" + (sources."uglify-js-2.7.3" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."when-3.7.7" + sources."ws-0.8.1" + sources."xml2js-0.4.17" + sources."node-red-node-feedparser-0.1.6" + sources."node-red-node-email-0.1.11" + (sources."node-red-node-twitter-0.1.7" // { + dependencies = [ + sources."request-2.76.0" + sources."form-data-2.1.1" + sources."qs-6.3.0" + ]; + }) + sources."node-red-node-rbe-0.1.5" + sources."node-red-node-serialport-0.4.0" + (sources."bcrypt-0.8.7" // { + dependencies = [ + sources."nan-2.3.5" + ]; + }) + sources."bytes-2.4.0" + sources."content-type-1.0.2" + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."http-errors-1.5.0" + sources."iconv-lite-0.4.13" + sources."on-finished-2.3.0" + sources."qs-6.2.0" + sources."type-is-1.6.13" + sources."ms-0.7.1" + sources."inherits-2.0.1" + sources."setprototypeof-1.0.1" + sources."statuses-1.3.0" + sources."ee-first-1.1.1" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" + sources."css-select-1.2.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."entities-1.1.1" + sources."htmlparser2-3.9.2" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.0" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."css-what-2.1.0" + sources."domutils-1.5.1" + sources."boolbase-1.0.0" + sources."nth-check-1.0.1" + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."vary-1.1.0" + sources."moment-timezone-0.5.7" + sources."moment-2.15.2" + sources."accepts-1.3.3" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."finalhandler-0.5.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.2" + sources."range-parser-1.2.0" + sources."send-0.14.1" + sources."serve-static-1.11.1" + sources."utils-merge-1.0.0" + sources."negotiator-0.6.1" + sources."unpipe-1.0.0" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.1.1" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."stream-consume-0.1.0" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."path-is-absolute-1.0.1" + sources."rimraf-2.5.4" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."async-0.1.22" + sources."retry-0.6.1" + sources."cookies-0.6.1" + sources."i18next-client-1.10.3" + sources."json5-0.2.0" + sources."keygrip-1.0.1" + sources."commist-1.0.0" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."help-me-1.0.1" + sources."minimist-1.2.0" + (sources."mqtt-connection-2.1.1" // { + dependencies = [ + sources."through2-0.6.5" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + sources."mqtt-packet-3.4.7" + sources."pump-1.0.1" + sources."reinterval-1.1.0" + sources."split2-2.1.0" + (sources."websocket-stream-3.3.0" // { + dependencies = [ + sources."ws-1.1.1" + ]; + }) + sources."xtend-4.0.1" + sources."leven-1.0.2" + sources."typedarray-0.0.6" + sources."callback-stream-1.1.0" + (sources."glob-stream-5.3.5" // { + dependencies = [ + sources."glob-5.0.15" + sources."through2-0.6.5" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."extend-3.0.0" + sources."glob-parent-3.0.1" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."ordered-read-streams-0.3.0" + sources."to-absolute-glob-0.1.1" + sources."unique-stream-2.2.1" + sources."is-glob-3.1.0" + sources."path-dirname-1.0.2" + sources."is-extglob-2.1.0" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) + sources."filename-regex-2.0.0" + sources."kind-of-3.0.4" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."repeat-string-1.6.1" + sources."is-posix-bracket-0.1.1" + sources."is-buffer-1.1.4" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-glob-2.0.1" + sources."is-extglob-1.0.0" + ]; + }) + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."is-stream-1.1.0" + sources."extend-shallow-2.0.1" + sources."json-stable-stringify-1.0.1" + sources."through2-filter-2.0.0" + sources."jsonify-0.0.0" + (sources."reduplexer-1.1.0" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + (sources."bl-0.9.5" // { + dependencies = [ + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + (sources."duplexify-3.5.0" // { + dependencies = [ + sources."end-of-stream-1.0.0" + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."abbrev-1.0.9" + sources."uid2-0.0.3" + sources."passport-strategy-1.0.0" + sources."pause-0.0.1" + sources."lodash.assign-4.0.1" + sources."lodash.keys-4.2.0" + sources."lodash.rest-4.0.5" + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."wordwrap-0.0.2" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."longest-1.0.1" + sources."bufferutil-1.2.1" + sources."utf-8-validate-1.2.1" + sources."bindings-1.2.1" + sources."nan-2.4.0" + sources."sax-1.2.1" + sources."xmlbuilder-4.2.1" + sources."lodash-4.16.4" + (sources."feedparser-1.1.3" // { + dependencies = [ + sources."sax-0.6.1" + sources."readable-stream-1.0.34" + sources."isarray-0.0.1" + ]; + }) + (sources."request-2.74.0" // { + dependencies = [ + sources."bl-1.1.2" + sources."readable-stream-2.0.6" + ]; + }) + sources."addressparser-0.1.3" + sources."array-indexofobject-0.0.1" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + sources."async-2.1.2" + ]; + }) + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."nodemailer-1.11.0" + sources."poplib-0.1.7" + sources."mailparser-0.6.1" + (sources."imap-0.8.18" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) + sources."libmime-1.2.0" + sources."mailcomposer-2.1.0" + sources."needle-0.11.0" + sources."nodemailer-direct-transport-1.1.0" + (sources."nodemailer-smtp-transport-1.1.0" // { + dependencies = [ + sources."clone-1.0.2" + ]; + }) + sources."libbase64-0.1.0" + sources."libqp-1.1.0" + (sources."buildmail-2.0.0" // { + dependencies = [ + sources."addressparser-0.3.2" + sources."needle-0.10.0" + ]; + }) + sources."smtp-connection-1.3.8" + sources."nodemailer-wellknown-0.1.10" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."mimelib-0.2.19" // { + dependencies = [ + sources."addressparser-0.3.2" + ]; + }) + sources."encoding-0.1.12" + sources."uue-3.0.0" + sources."utf7-1.0.2" + sources."twitter-ng-0.6.2" + sources."oauth-0.9.14" + sources."asynckit-0.4.0" + sources."serialport-4.0.3" + sources."lie-3.1.0" + (sources."node-pre-gyp-0.6.31" // { + dependencies = [ + sources."request-2.76.0" + sources."form-data-2.1.1" + sources."qs-6.3.0" + ]; + }) + sources."object.assign-4.0.4" + sources."immediate-3.0.6" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."npmlog-4.0.0" + sources."rc-1.1.6" + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."function-bind-1.1.0" + sources."object-keys-1.0.11" + sources."define-properties-1.1.2" + sources."foreach-2.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A visual tool for wiring the Internet of Things"; + homepage = http://nodered.org/; + license = "Apache-2.0"; + }; + production = true; + }; + "node-uptime-https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" = nodeEnv.buildNodePackage { + name = "node-uptime"; + packageName = "node-uptime"; + version = "3.2.0"; + src = fetchurl { + name = "node-uptime-3.2.0.tar.gz"; + url = https://codeload.github.com/fzaninotto/uptime/legacy.tar.gz/1c65756575f90f563a752e2a22892ba2981c79b7; + sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; + }; + dependencies = [ + sources."mongoose-3.6.7" + sources."mongoose-lifecycle-1.0.0" + sources."express-3.2.0" + sources."express-partials-0.0.6" + sources."connect-flash-0.1.0" + sources."ejs-0.8.3" + (sources."config-0.4.15" // { + dependencies = [ + sources."js-yaml-0.3.7" + ]; + }) + sources."async-0.1.22" + sources."socket.io-0.9.14" + sources."semver-1.1.0" + sources."moment-2.1.0" + sources."nodemailer-0.3.35" + sources."net-ping-1.1.7" + sources."js-yaml-2.1.0" + sources."hooks-0.2.1" + sources."mongodb-1.2.14" + sources."ms-0.1.0" + sources."sliced-0.0.3" + sources."muri-0.3.1" + (sources."mpromise-0.2.1" // { + dependencies = [ + sources."sliced-0.0.4" + ]; + }) + sources."mpath-0.1.1" + sources."bson-0.1.8" + (sources."connect-2.7.6" // { + dependencies = [ + sources."buffer-crc32-0.1.1" + ]; + }) + sources."commander-0.6.1" + sources."range-parser-0.0.4" + sources."mkdirp-0.3.5" + sources."cookie-0.0.5" + sources."buffer-crc32-0.2.5" + sources."fresh-0.1.0" + sources."methods-0.0.1" + sources."send-0.1.0" + sources."cookie-signature-1.0.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."qs-0.5.1" + sources."formidable-1.0.11" + sources."bytes-0.2.0" + sources."pause-0.0.1" + sources."mime-1.2.6" + sources."coffee-script-1.11.1" + sources."vows-0.8.1" + sources."eyes-0.1.8" + sources."diff-1.0.8" + sources."glob-4.0.6" + sources."graceful-fs-3.0.11" + sources."inherits-2.0.3" + sources."minimatch-1.0.0" + sources."once-1.4.0" + sources."natives-1.1.0" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."wrappy-1.0.2" + sources."socket.io-client-0.9.11" + sources."policyfile-0.0.4" + sources."base64id-0.1.0" + sources."redis-0.7.3" + sources."uglify-js-1.2.5" + (sources."ws-0.4.32" // { + dependencies = [ + sources."commander-2.1.0" + ]; + }) + sources."xmlhttprequest-1.4.2" + sources."active-x-obfuscator-0.0.1" + sources."nan-1.0.0" + sources."tinycolor-0.0.1" + sources."options-0.0.6" + sources."zeparser-0.0.5" + sources."mailcomposer-3.12.0" + sources."simplesmtp-0.3.35" + sources."optimist-0.6.1" + sources."buildmail-3.10.0" + sources."libmime-2.1.0" + sources."addressparser-1.0.1" + sources."libbase64-0.1.0" + sources."libqp-1.1.0" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" + sources."iconv-lite-0.4.13" + sources."rai-0.1.12" + sources."xoauth2-0.1.8" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + (sources."raw-socket-1.5.0" // { + dependencies = [ + sources."nan-2.3.5" + ]; + }) + sources."argparse-0.1.16" + sources."esprima-1.0.4" + sources."underscore-1.7.0" + sources."underscore.string-2.4.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Remote monitoring for HTTP applications"; + license = "MIT"; + }; + production = true; + }; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "3.10.9"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-3.10.9.tgz"; + sha1 = "6b5cba2c765cb7d7febb0492f2a8cefaee86a2e3"; + }; + dependencies = [ + sources."abbrev-1.0.9" + sources."ansicolors-0.3.2" + sources."ansistyles-0.1.3" + sources."aproba-1.0.4" + sources."archy-1.0.0" + sources."asap-2.0.5" + sources."chownr-1.0.1" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."config-chain-1.1.11" + sources."dezalgo-1.0.3" + sources."editor-1.0.0" + sources."fs-vacuum-1.2.9" + sources."fs-write-stream-atomic-1.0.8" + sources."fstream-1.0.10" + sources."fstream-npm-1.2.0" + sources."glob-7.1.1" + sources."graceful-fs-4.1.9" + sources."has-unicode-2.0.1" + sources."hosted-git-info-2.1.5" + sources."iferr-0.1.5" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.4" + (sources."init-package-json-1.9.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + sources."lockfile-1.0.2" + sources."lodash._baseuniq-4.6.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" + sources."mkdirp-0.5.1" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) + sources."nopt-3.0.6" + sources."normalize-git-url-3.0.2" + sources."normalize-package-data-2.3.5" + sources."npm-cache-filename-1.0.2" + sources."npm-install-checks-3.0.0" + sources."npm-package-arg-4.2.0" + (sources."npm-registry-client-7.2.1" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) + sources."npm-user-validate-0.1.5" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" + sources."osenv-0.1.3" + sources."path-is-inside-1.0.2" + sources."read-1.0.7" + sources."read-cmd-shim-1.0.1" + sources."read-installed-4.0.3" + (sources."read-package-json-2.0.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + sources."read-package-tree-5.1.5" + sources."readable-stream-2.1.5" + sources."realize-package-specifier-3.0.3" + sources."request-2.75.0" + sources."retry-0.10.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."sha-2.0.1" + sources."slide-1.1.6" + sources."sorted-object-2.0.1" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."text-table-0.2.0" + sources."uid-number-0.0.6" + sources."umask-1.1.0" + sources."unique-filename-1.1.0" + sources."unpipe-1.0.0" + sources."validate-npm-package-name-2.2.2" + sources."which-1.2.11" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.2.0" + sources."ansi-regex-2.0.0" + sources."debuglog-1.0.1" + sources."imurmurhash-0.1.4" + sources."lodash._baseindexof-3.1.0" + sources."lodash._bindcallback-3.0.1" + sources."lodash._cacheindexof-3.0.2" + sources."lodash._createcache-3.1.2" + sources."lodash._getnative-3.9.1" + sources."lodash.restparam-3.6.1" + sources."readdir-scoped-modules-1.0.2" + sources."validate-npm-package-license-3.0.1" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."proto-list-1.2.4" + sources."fstream-ignore-1.0.5" + sources."minimatch-3.0.3" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."path-is-absolute-1.0.1" + sources."promzard-0.3.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."minimist-0.0.8" + sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."array-index-1.0.0" + sources."debug-2.2.0" + sources."es6-symbol-3.1.0" + sources."ms-0.7.1" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."mute-stream-0.0.6" + sources."util-extend-1.0.3" + sources."json-parse-helpfulerror-1.0.3" + sources."jju-1.3.0" + sources."buffer-shims-1.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.0.0" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."unique-slug-2.0.0" + sources."builtins-0.0.7" + sources."isexe-1.1.2" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + }; + "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { + name = "npm2nix"; + packageName = "npm2nix"; + version = "5.12.0"; + src = fetchgit { + url = "git://github.com/NixOS/npm2nix.git"; + rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; + sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; + }; + dependencies = [ + sources."semver-4.3.6" + sources."argparse-0.1.15" + (sources."npm-registry-client-0.2.27" // { + dependencies = [ + sources."semver-2.0.11" + ]; + }) + (sources."npmconf-0.1.1" // { + dependencies = [ + sources."inherits-1.0.2" + sources."once-1.1.1" + sources."semver-2.3.2" + ]; + }) + (sources."tar-0.1.17" // { + dependencies = [ + sources."inherits-1.0.2" + ]; + }) + (sources."temp-0.6.0" // { + dependencies = [ + sources."rimraf-2.1.4" + sources."graceful-fs-1.2.3" + ]; + }) + sources."fs.extra-1.3.2" + sources."findit-1.2.0" + sources."coffee-script-1.11.1" + sources."underscore-1.4.4" + sources."underscore.string-2.3.3" + sources."request-2.76.0" + sources."graceful-fs-2.0.3" + sources."slide-1.1.6" + sources."chownr-0.0.2" + sources."mkdirp-0.3.5" + sources."rimraf-2.5.4" + sources."retry-0.6.0" + sources."couch-login-0.1.20" + sources."npmlog-4.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.4" + ]; + }) + sources."osenv-0.0.3" + sources."nopt-2.2.1" + sources."ini-1.1.0" + sources."proto-list-1.2.4" + sources."abbrev-1.0.9" + sources."block-stream-0.0.9" + (sources."fstream-0.1.31" // { + dependencies = [ + sources."graceful-fs-3.0.11" + sources."mkdirp-0.5.1" + ]; + }) + sources."natives-1.1.0" + sources."minimist-0.0.8" + (sources."fs-extra-0.6.4" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."walk-2.3.9" + sources."ncp-0.4.2" + sources."jsonfile-1.0.1" + sources."foreachasync-3.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Generate nix expressions to build npm packages"; + homepage = https://github.com/NixOS/npm2nix; + }; + production = true; + }; + npm-check-updates = nodeEnv.buildNodePackage { + name = "npm-check-updates"; + packageName = "npm-check-updates"; + version = "2.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.6.tgz"; + sha1 = "9e3a0865b29dfc9af8c3d53d95b43f4bc6b1f212"; + }; + dependencies = [ + sources."bluebird-3.4.6" + sources."chalk-1.1.3" + sources."cint-8.2.1" + sources."cli-table-0.3.1" + sources."commander-2.9.0" + sources."fast-diff-1.1.1" + sources."find-up-1.1.2" + sources."get-stdin-5.0.1" + sources."json-parse-helpfulerror-1.0.3" + sources."lodash-4.16.4" + sources."node-alias-1.0.4" + sources."npm-3.10.9" + (sources."npmi-2.0.1" // { + dependencies = [ + sources."semver-4.3.6" + ]; + }) + sources."require-dir-0.3.1" + sources."semver-5.3.0" + sources."semver-utils-1.1.1" + sources."spawn-please-0.2.0" + sources."update-notifier-1.0.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."colors-1.0.3" + sources."graceful-readlink-1.0.1" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."jju-1.3.0" + sources."abbrev-1.0.9" + sources."ansicolors-0.3.2" + sources."ansistyles-0.1.3" + sources."aproba-1.0.4" + sources."archy-1.0.0" + sources."asap-2.0.5" + sources."chownr-1.0.1" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."config-chain-1.1.11" + sources."dezalgo-1.0.3" + sources."editor-1.0.0" + sources."fs-vacuum-1.2.9" + sources."fs-write-stream-atomic-1.0.8" + sources."fstream-1.0.10" + sources."fstream-npm-1.2.0" + sources."glob-7.1.1" + sources."graceful-fs-4.1.9" + sources."has-unicode-2.0.1" + sources."hosted-git-info-2.1.5" + sources."iferr-0.1.5" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.4" + (sources."init-package-json-1.9.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + sources."lockfile-1.0.2" + sources."lodash._baseuniq-4.6.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" + sources."mkdirp-0.5.1" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) + sources."nopt-3.0.6" + sources."normalize-git-url-3.0.2" + sources."normalize-package-data-2.3.5" + sources."npm-cache-filename-1.0.2" + sources."npm-install-checks-3.0.0" + sources."npm-package-arg-4.2.0" + (sources."npm-registry-client-7.2.1" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) + sources."npm-user-validate-0.1.5" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" + sources."osenv-0.1.3" + sources."path-is-inside-1.0.2" + sources."read-1.0.7" + sources."read-cmd-shim-1.0.1" + sources."read-installed-4.0.3" + (sources."read-package-json-2.0.4" // { + dependencies = [ + sources."glob-6.0.4" + ]; + }) + sources."read-package-tree-5.1.5" + sources."readable-stream-2.1.5" + sources."realize-package-specifier-3.0.3" + sources."request-2.75.0" + sources."retry-0.10.0" + sources."rimraf-2.5.4" + sources."sha-2.0.1" + sources."slide-1.1.6" + sources."sorted-object-2.0.1" + sources."tar-2.2.1" + sources."text-table-0.2.0" + sources."uid-number-0.0.6" + sources."umask-1.1.0" + sources."unique-filename-1.1.0" + sources."unpipe-1.0.0" + sources."validate-npm-package-name-2.2.2" + sources."which-1.2.11" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.2.0" + sources."debuglog-1.0.1" + sources."imurmurhash-0.1.4" + sources."lodash._baseindexof-3.1.0" + sources."lodash._bindcallback-3.0.1" + sources."lodash._cacheindexof-3.0.2" + sources."lodash._createcache-3.1.2" + sources."lodash._getnative-3.9.1" + sources."lodash.restparam-3.6.1" + sources."readdir-scoped-modules-1.0.2" + sources."validate-npm-package-license-3.0.1" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."proto-list-1.2.4" + sources."fstream-ignore-1.0.5" + sources."minimatch-3.0.3" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."path-is-absolute-1.0.1" + sources."promzard-0.3.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."minimist-0.0.8" + sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."array-index-1.0.0" + sources."debug-2.2.0" + sources."es6-symbol-3.1.0" + sources."ms-0.7.1" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."mute-stream-0.0.6" + sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.0.0" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."is-my-json-valid-2.15.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."block-stream-0.0.9" + sources."unique-slug-2.0.0" + sources."builtins-0.0.7" + sources."isexe-1.1.2" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."boxen-0.6.0" + sources."configstore-2.1.0" + sources."is-npm-1.0.0" + sources."latest-version-2.0.0" + sources."lazy-req-1.1.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-2.0.0" + sources."ansi-align-1.1.0" + sources."camelcase-2.1.1" + sources."cli-boxes-1.0.0" + sources."filled-array-1.1.0" + sources."repeating-2.0.1" + sources."widest-line-1.0.0" + sources."is-finite-1.0.2" + sources."dot-prop-3.0.0" + sources."uuid-2.0.3" + sources."is-obj-1.0.1" + sources."package-json-2.4.0" + sources."got-5.6.0" + sources."registry-auth-token-3.1.0" + sources."registry-url-3.1.0" + sources."create-error-class-3.0.2" + sources."duplexer2-0.1.4" + sources."is-plain-obj-1.1.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-1.0.0" + sources."parse-json-2.2.0" + sources."read-all-stream-3.1.0" + sources."timed-out-2.0.0" + sources."unzip-response-1.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."prepend-http-1.0.4" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.1" + sources."strip-json-comments-1.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find newer versions of dependencies than what your package.json or bower.json allows"; + homepage = https://github.com/tjunnone/npm-check-updates; + license = "MIT"; + }; + production = true; + }; + peerflix = nodeEnv.buildNodePackage { + name = "peerflix"; + packageName = "peerflix"; + version = "0.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.0.tgz"; + sha1 = "fe3b087f07389ca1c2fd3d71e38a7971d5508924"; + }; + dependencies = [ + sources."airplayer-2.0.0" + sources."clivas-0.2.0" + (sources."inquirer-1.2.2" // { + dependencies = [ + sources."lodash-4.16.4" + ]; + }) + sources."keypress-0.2.1" + sources."mime-1.3.4" + sources."network-address-1.1.0" + sources."numeral-1.5.3" + sources."open-0.0.5" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) + (sources."parse-torrent-5.8.1" // { + dependencies = [ + sources."get-stdin-5.0.1" + ]; + }) + sources."pump-1.0.1" + sources."range-parser-1.2.0" + sources."rc-1.1.6" + (sources."torrent-stream-1.0.3" // { + dependencies = [ + sources."end-of-stream-0.1.5" + sources."parse-torrent-4.1.0" + sources."once-1.3.3" + sources."magnet-uri-4.2.3" + sources."parse-torrent-file-2.1.4" + sources."thirty-two-0.0.2" + sources."bencode-0.7.0" + ]; + }) + sources."windows-no-runnable-0.0.6" + sources."xtend-4.0.1" + sources."airplay-protocol-2.0.2" + sources."appendable-cli-menu-2.0.0" + sources."bonjour-3.5.0" + sources."internal-ip-1.2.0" + sources."minimist-1.2.0" + sources."server-destroy-1.0.1" + sources."bplist-creator-0.0.6" + sources."bplist-parser-0.1.1" + sources."concat-stream-1.5.2" + sources."plist-1.2.0" + sources."reverse-http-1.2.0" + sources."stream-buffers-2.2.0" + sources."big-integer-1.6.16" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."base64-js-0.0.8" + sources."xmlbuilder-4.0.0" + sources."xmldom-0.1.22" + sources."lodash-3.10.1" + sources."consume-http-header-1.0.0" + sources."once-1.4.0" + sources."consume-until-1.0.0" + sources."http-headers-3.0.1" + sources."buffer-indexof-1.1.0" + sources."next-line-1.1.0" + sources."wrappy-1.0.2" + sources."chalk-1.1.3" + sources."single-line-log-1.1.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."string-width-1.0.2" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."array-flatten-2.1.0" + sources."deep-equal-1.0.1" + sources."dns-equal-1.0.0" + sources."dns-txt-2.0.2" + sources."multicast-dns-6.1.0" + sources."multicast-dns-service-types-1.1.0" + sources."dns-packet-1.1.0" + sources."thunky-0.1.0" + sources."ip-1.1.3" + sources."meow-3.7.0" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."normalize-package-data-2.3.5" + sources."object-assign-4.1.0" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."get-stdin-4.0.1" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."cli-width-2.1.0" + sources."external-editor-1.1.1" + sources."figures-1.7.0" + sources."mute-stream-0.0.6" + sources."run-async-2.2.0" + sources."rx-4.1.0" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."extend-3.0.0" + sources."spawn-sync-1.0.15" + sources."tmp-0.0.29" + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."is-promise-2.1.0" + sources."wordwrap-0.0.3" + sources."blob-to-buffer-1.2.6" + sources."magnet-uri-5.1.4" + sources."parse-torrent-file-4.0.0" + sources."simple-get-2.3.0" + sources."thirty-two-1.0.2" + sources."uniq-1.0.1" + sources."bencode-0.10.0" + sources."simple-sha1-2.0.8" + sources."rusha-0.8.4" + sources."simple-concat-1.0.0" + sources."unzip-response-2.0.1" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."bitfield-0.1.0" + sources."bncode-0.5.3" + (sources."fs-chunk-store-1.6.4" // { + dependencies = [ + sources."mkdirp-0.5.1" + sources."thunky-1.0.1" + sources."minimist-0.0.8" + ]; + }) + sources."hat-0.0.3" + sources."immediate-chunk-store-1.0.8" + sources."ip-set-1.0.1" + sources."mkdirp-0.3.5" + sources."peer-wire-swarm-0.12.1" + sources."rimraf-2.5.4" + sources."torrent-discovery-5.4.0" + sources."torrent-piece-1.1.0" + (sources."random-access-file-1.3.1" // { + dependencies = [ + sources."mkdirp-0.5.1" + sources."thunky-1.0.1" + sources."minimist-0.0.8" + ]; + }) + sources."randombytes-2.0.3" + sources."run-parallel-1.1.6" + sources."flatten-0.0.1" + sources."fifo-0.1.4" + (sources."peer-wire-protocol-0.7.0" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."bncode-0.2.3" + sources."isarray-0.0.1" + ]; + }) + sources."speedometer-0.1.4" + sources."utp-0.0.7" + sources."cyclist-0.1.1" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."bittorrent-dht-6.4.2" // { + dependencies = [ + sources."bencode-0.7.0" + ]; + }) + (sources."bittorrent-tracker-7.7.0" // { + dependencies = [ + sources."bencode-0.8.0" + ]; + }) + sources."debug-2.2.0" + sources."re-emitter-1.1.3" + sources."buffer-equals-1.0.4" + sources."k-bucket-0.6.0" + (sources."k-rpc-3.7.0" // { + dependencies = [ + sources."k-bucket-2.0.1" + ]; + }) + sources."lru-2.0.1" + sources."buffer-equal-0.0.1" + sources."k-rpc-socket-1.6.0" + sources."bn.js-4.11.6" + sources."compact2string-1.4.0" + sources."random-iterate-1.0.1" + sources."run-series-1.1.4" + sources."simple-peer-6.0.7" + sources."simple-websocket-4.1.0" + sources."string2compact-1.2.2" + sources."ws-1.1.1" + sources."ipaddr.js-1.2.0" + sources."get-browser-rtc-1.0.2" + sources."addr-to-ip-port-1.4.2" + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."ms-0.7.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Streaming torrent client for Node.js"; + homepage = https://github.com/mafintosh/peerflix; + license = "MIT"; + }; + production = true; + }; + peerflix-server = nodeEnv.buildNodePackage { + name = "peerflix-server"; + packageName = "peerflix-server"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.30.tgz"; + sha1 = "858a78e9ad0bdffa91997a6f0ca0bd809320ad98"; + }; + dependencies = [ + sources."connect-multiparty-1.2.5" + (sources."express-3.5.3" // { + dependencies = [ + sources."range-parser-1.0.0" + sources."mkdirp-0.4.0" + ]; + }) + sources."lodash-2.4.2" + sources."mkdirp-0.5.1" + sources."pump-1.0.1" + sources."range-parser-1.2.0" + sources."read-torrent-1.3.0" + sources."socket.io-0.9.17" + (sources."torrent-stream-0.18.1" // { + dependencies = [ + sources."end-of-stream-0.1.5" + sources."mkdirp-0.3.5" + sources."once-1.3.3" + ]; + }) + sources."fluent-ffmpeg-2.1.0" + sources."multiparty-3.3.2" + sources."on-finished-2.1.1" + sources."qs-2.2.5" + sources."type-is-1.5.7" + sources."readable-stream-1.1.14" + sources."stream-counter-0.2.0" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + sources."ee-first-1.1.0" + sources."media-typer-0.3.0" + sources."mime-types-2.0.14" + sources."mime-db-1.12.0" + (sources."connect-2.14.5" // { + dependencies = [ + sources."qs-0.6.6" + sources."multiparty-2.2.0" + ]; + }) + sources."commander-1.3.2" + sources."cookie-0.1.2" + sources."buffer-crc32-0.2.1" + sources."fresh-0.2.2" + sources."methods-0.1.0" + (sources."send-0.3.0" // { + dependencies = [ + sources."debug-0.8.0" + sources."range-parser-1.0.3" + ]; + }) + sources."cookie-signature-1.0.3" + sources."merge-descriptors-0.0.2" + sources."debug-0.8.1" + sources."basic-auth-connect-1.0.0" + (sources."cookie-parser-1.0.1" // { + dependencies = [ + sources."cookie-0.1.0" + ]; + }) + (sources."compression-1.0.0" // { + dependencies = [ + sources."bytes-0.2.1" + ]; + }) + sources."connect-timeout-1.0.0" + sources."csurf-1.1.0" + sources."errorhandler-1.0.0" + (sources."express-session-1.0.2" // { + dependencies = [ + sources."cookie-0.1.0" + sources."debug-0.7.4" + ]; + }) + sources."method-override-1.0.0" + (sources."morgan-1.0.0" // { + dependencies = [ + sources."bytes-0.2.1" + ]; + }) + sources."raw-body-1.1.4" + sources."response-time-1.0.0" + sources."setimmediate-1.0.1" + (sources."serve-index-1.0.1" // { + dependencies = [ + sources."negotiator-0.4.2" + ]; + }) + sources."serve-static-1.1.0" + sources."static-favicon-1.0.2" + sources."vhost-1.0.0" + sources."bytes-0.3.0" + sources."pause-0.0.1" + sources."negotiator-0.3.0" + sources."compressible-1.0.0" + sources."uid2-0.0.3" + sources."scmp-0.0.3" + sources."utils-merge-1.0.0" + sources."batch-0.5.0" + sources."parseurl-1.0.1" + sources."keypress-0.1.0" + sources."mime-1.2.11" + sources."minimist-0.0.8" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."magnet-uri-2.0.1" + (sources."parse-torrent-4.1.0" // { + dependencies = [ + sources."magnet-uri-4.2.3" + ]; + }) + (sources."request-2.16.6" // { + dependencies = [ + sources."qs-0.5.6" + ]; + }) + sources."xtend-4.0.1" + sources."thirty-two-0.0.2" + sources."parse-torrent-file-2.1.4" + sources."flatten-0.0.1" + sources."bencode-0.7.0" + sources."simple-sha1-2.0.8" + sources."rusha-0.8.4" + sources."form-data-0.0.10" + sources."hawk-0.10.2" + sources."node-uuid-1.4.7" + sources."cookie-jar-0.2.0" + sources."aws-sign-0.2.0" + sources."oauth-sign-0.2.0" + sources."forever-agent-0.2.0" + sources."tunnel-agent-0.2.0" + sources."json-stringify-safe-3.0.0" + sources."combined-stream-0.0.7" + sources."async-0.2.10" + sources."delayed-stream-0.0.5" + sources."hoek-0.7.6" + sources."boom-0.3.8" + sources."cryptiles-0.1.3" + sources."sntp-0.1.4" + sources."socket.io-client-0.9.16" + sources."policyfile-0.0.4" + sources."base64id-0.1.0" + sources."redis-0.7.3" + sources."uglify-js-1.2.5" + (sources."ws-0.4.32" // { + dependencies = [ + sources."commander-2.1.0" + ]; + }) + sources."xmlhttprequest-1.4.2" + sources."active-x-obfuscator-0.0.1" + sources."nan-1.0.0" + sources."tinycolor-0.0.1" + sources."options-0.0.6" + sources."zeparser-0.0.5" + sources."bitfield-0.1.0" + (sources."bittorrent-dht-3.2.6" // { + dependencies = [ + sources."debug-2.2.0" + ]; + }) + (sources."bittorrent-tracker-2.12.1" // { + dependencies = [ + sources."bencode-0.6.0" + sources."debug-2.2.0" + ]; + }) + sources."bncode-0.5.3" + sources."compact2string-1.4.0" + sources."hat-0.0.3" + sources."ip-0.3.3" + (sources."ip-set-1.0.1" // { + dependencies = [ + sources."ip-1.1.3" + ]; + }) + sources."peer-wire-swarm-0.9.2" + sources."random-access-file-0.3.2" + sources."rimraf-2.5.4" + sources."thunky-0.1.0" + sources."addr-to-ip-port-1.4.2" + sources."buffer-equal-0.0.1" + sources."is-ip-1.0.0" + sources."k-bucket-0.5.0" + sources."network-address-1.1.0" + sources."run-parallel-1.1.6" + sources."simple-get-1.4.3" + sources."string2compact-1.2.2" + sources."ms-0.7.1" + sources."ip-regex-1.0.3" + sources."unzip-response-1.0.1" + sources."ipaddr.js-1.2.0" + sources."bn.js-1.3.0" + sources."extend.js-0.0.2" + (sources."portfinder-0.3.0" // { + dependencies = [ + sources."mkdirp-0.0.7" + ]; + }) + sources."run-series-1.1.4" + (sources."peer-wire-protocol-0.7.0" // { + dependencies = [ + sources."bncode-0.2.3" + ]; + }) + sources."fifo-0.1.4" + sources."speedometer-0.1.4" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."which-1.2.11" + sources."isexe-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Streaming torrent client for node.js with web ui."; + homepage = "https://github.com/asapach/peerflix-server#readme"; + license = "MIT"; + }; + production = true; + }; + phantomjs = nodeEnv.buildNodePackage { + name = "phantomjs"; + packageName = "phantomjs"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz"; + sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134"; + }; + dependencies = [ + sources."extract-zip-1.5.0" + sources."fs-extra-0.26.7" + sources."hasha-2.2.0" + sources."kew-0.7.0" + sources."progress-1.1.8" + sources."request-2.67.0" + sources."request-progress-2.0.1" + sources."which-1.2.11" + sources."concat-stream-1.5.0" + sources."debug-0.7.4" + sources."mkdirp-0.5.0" + sources."yauzl-2.4.1" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."minimist-0.0.8" + sources."fd-slicer-1.0.1" + sources."pend-1.2.0" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."path-is-absolute-1.0.1" + sources."rimraf-2.5.4" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."is-stream-1.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."bl-1.0.3" + sources."caseless-0.11.0" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."qs-5.2.1" + sources."tunnel-agent-0.4.3" + sources."tough-cookie-2.2.2" + sources."http-signature-1.1.1" + sources."oauth-sign-0.8.2" + sources."hawk-3.1.3" + sources."aws-sign2-0.6.0" + sources."stringstream-0.0.5" + sources."combined-stream-1.0.5" + sources."isstream-0.1.2" + sources."is-typedarray-1.0.0" + sources."har-validator-2.0.6" + sources."async-2.1.2" + sources."lodash-4.16.4" + sources."mime-db-1.24.0" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."delayed-stream-1.0.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."throttleit-1.0.0" + sources."isexe-1.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Headless WebKit with JS API"; + homepage = https://github.com/Medium/phantomjs; + license = "Apache-2.0"; + }; + production = true; + }; + react-tools = nodeEnv.buildNodePackage { + name = "react-tools"; + packageName = "react-tools"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz"; + sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; + }; + dependencies = [ + sources."commoner-0.10.4" + (sources."jstransform-10.1.0" // { + dependencies = [ + sources."esprima-fb-13001.1001.0-dev-harmony-fb" + sources."source-map-0.1.31" + ]; + }) + sources."commander-2.9.0" + sources."detective-4.3.2" + sources."glob-5.0.15" + sources."graceful-fs-4.1.9" + sources."iconv-lite-0.4.13" + sources."mkdirp-0.5.1" + sources."private-0.1.6" + sources."q-1.4.1" + sources."recast-0.10.43" + sources."graceful-readlink-1.0.1" + sources."acorn-3.3.0" + sources."defined-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."minimist-0.0.8" + sources."esprima-fb-15001.1001.0-dev-harmony-fb" + sources."source-map-0.5.6" + sources."ast-types-0.8.15" + sources."base62-0.1.1" + sources."amdefine-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A set of complementary tools to React, including the JSX transformer."; + homepage = https://facebook.github.io/react; + license = "BSD-3-Clause"; + }; + production = true; + }; + s3http = nodeEnv.buildNodePackage { + name = "s3http"; + packageName = "s3http"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; + sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; + }; + dependencies = [ + sources."aws-sdk-1.18.0" + sources."commander-2.0.0" + sources."http-auth-2.0.7" + (sources."express-3.4.4" // { + dependencies = [ + sources."commander-1.3.2" + ]; + }) + (sources."everyauth-0.4.5" // { + dependencies = [ + sources."connect-2.3.9" + sources."debug-0.5.0" + sources."qs-0.4.2" + sources."cookie-0.0.4" + sources."bytes-0.1.0" + sources."send-0.0.3" + sources."fresh-0.1.0" + sources."mime-1.2.6" + ]; + }) + sources."string-1.6.1" + sources."util-0.4.9" + sources."crypto-0.0.3" + sources."xml2js-0.2.4" + sources."xmlbuilder-0.4.2" + sources."sax-1.2.1" + sources."coffee-script-1.6.3" + sources."node-uuid-1.4.1" + (sources."connect-2.11.0" // { + dependencies = [ + sources."methods-0.0.1" + ]; + }) + sources."range-parser-0.0.4" + sources."mkdirp-0.3.5" + sources."cookie-0.1.0" + sources."buffer-crc32-0.2.1" + sources."fresh-0.2.0" + sources."methods-0.1.0" + sources."send-0.1.4" + sources."cookie-signature-1.0.1" + sources."debug-2.2.0" + sources."qs-0.6.5" + sources."bytes-0.2.1" + sources."pause-0.0.1" + sources."uid2-0.0.3" + sources."raw-body-0.0.3" + sources."negotiator-0.3.0" + sources."multiparty-2.2.0" + sources."readable-stream-1.1.14" + sources."stream-counter-0.2.0" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + sources."keypress-0.1.0" + sources."mime-1.2.11" + sources."ms-0.7.1" + sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" + sources."request-2.9.203" + (sources."openid-2.0.6" // { + dependencies = [ + sources."request-2.76.0" + sources."node-uuid-1.4.7" + sources."qs-6.3.0" + ]; + }) + sources."node-swt-0.1.1" + sources."node-wsfederation-0.1.1" + sources."formidable-1.0.11" + sources."crc-0.2.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + (sources."har-validator-2.0.6" // { + dependencies = [ + sources."commander-2.9.0" + ]; + }) + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."events.node-0.4.9" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + }; + semver = nodeEnv.buildNodePackage { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The semantic version parser used by npm."; + homepage = "https://github.com/npm/node-semver#readme"; + license = "ISC"; + }; + production = true; + }; + sinopia = nodeEnv.buildNodePackage { + name = "sinopia"; + packageName = "sinopia"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sinopia/-/sinopia-1.4.0.tgz"; + sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; + }; + dependencies = [ + sources."express-5.0.0-alpha.2" + sources."express-json5-0.1.0" + (sources."body-parser-1.15.2" // { + dependencies = [ + sources."bytes-2.4.0" + sources."depd-1.1.0" + sources."iconv-lite-0.4.13" + sources."qs-6.2.0" + sources."raw-body-2.1.7" + ]; + }) + (sources."compression-1.6.2" // { + dependencies = [ + sources."accepts-1.3.3" + sources."bytes-2.3.0" + sources."vary-1.1.0" + sources."negotiator-0.6.1" + ]; + }) + sources."commander-2.9.0" + sources."js-yaml-3.6.1" + (sources."cookies-0.6.1" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + (sources."request-2.76.0" // { + dependencies = [ + sources."qs-6.3.0" + ]; + }) + sources."async-0.9.2" + sources."es6-shim-0.21.1" + sources."semver-4.3.6" + sources."minimatch-1.0.0" + sources."bunyan-1.8.4" + sources."handlebars-2.0.0" + sources."highlight.js-8.9.1" + sources."lunr-0.7.2" + sources."render-readme-1.3.1" + sources."jju-1.3.0" + sources."JSONStream-1.2.1" + sources."mkdirp-0.5.1" + sources."sinopia-htpasswd-0.4.5" + (sources."http-errors-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."setprototypeof-1.0.1" + sources."statuses-1.3.0" + ]; + }) + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."fs-ext-0.5.0" + sources."crypt3-0.2.0" + sources."accepts-1.2.13" + sources."array-flatten-1.1.0" + sources."content-disposition-0.5.0" + sources."content-type-1.0.2" + sources."cookie-0.1.3" + sources."cookie-signature-1.0.6" + sources."debug-2.2.0" + sources."depd-1.0.1" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + sources."finalhandler-0.4.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.0" + sources."methods-1.1.2" + sources."on-finished-2.3.0" + sources."parseurl-1.3.1" + sources."path-is-absolute-1.0.0" + sources."path-to-regexp-0.1.6" + sources."proxy-addr-1.0.10" + sources."qs-4.0.0" + sources."range-parser-1.0.3" + (sources."router-1.1.4" // { + dependencies = [ + sources."array-flatten-2.0.0" + sources."path-to-regexp-0.1.7" + ]; + }) + (sources."send-0.13.0" // { + dependencies = [ + sources."http-errors-1.3.1" + ]; + }) + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."escape-html-1.0.3" + sources."send-0.13.2" + sources."depd-1.1.0" + sources."destroy-1.0.4" + sources."http-errors-1.3.1" + ]; + }) + sources."type-is-1.6.13" + sources."vary-1.0.1" + sources."utils-merge-1.0.0" + sources."mime-types-2.1.12" + sources."negotiator-0.5.3" + sources."mime-db-1.24.0" + sources."ms-0.7.1" + sources."unpipe-1.0.0" + sources."ee-first-1.1.1" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + sources."setprototypeof-1.0.0" + sources."destroy-1.0.3" + sources."mime-1.3.4" + sources."statuses-1.2.1" + sources."inherits-2.0.3" + sources."media-typer-0.3.0" + sources."raw-body-1.3.4" + sources."bytes-1.0.0" + sources."iconv-lite-0.4.8" + sources."compressible-2.0.8" + sources."on-headers-1.0.1" + sources."graceful-readlink-1.0.1" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + sources."keygrip-1.0.1" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."punycode-1.4.1" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."dtrace-provider-0.7.1" + sources."mv-2.1.1" + sources."safe-json-stringify-1.0.3" + sources."moment-2.15.2" + sources."nan-2.4.0" + sources."ncp-2.0.0" + sources."rimraf-2.4.5" + (sources."glob-6.0.4" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."optimist-0.3.7" + (sources."uglify-js-2.3.6" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."wordwrap-0.0.3" + sources."source-map-0.1.43" + sources."amdefine-1.0.0" + sources."markdown-it-4.4.0" + sources."sanitize-html-1.13.0" + sources."entities-1.1.1" + sources."linkify-it-1.2.4" + sources."mdurl-1.0.1" + sources."uc.micro-1.0.3" + (sources."htmlparser2-3.9.2" // { + dependencies = [ + sources."readable-stream-2.1.5" + ]; + }) + sources."regexp-quote-0.0.0" + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."jsonparse-1.2.0" + sources."through-2.3.8" + sources."minimist-0.0.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Private npm repository server"; + homepage = https://github.com/rlidwka/sinopia; + license = { + type = "WTFPL"; + url = "http://www.wtfpl.net/txt/copying/"; + }; + }; + production = true; + }; + sloc = nodeEnv.buildNodePackage { + name = "sloc"; + packageName = "sloc"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz"; + sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411"; + }; + dependencies = [ + sources."async-1.5.2" + sources."cli-table-0.3.1" + sources."commander-2.9.0" + sources."readdirp-2.1.0" + sources."colors-1.0.3" + sources."graceful-readlink-1.0.1" + sources."graceful-fs-4.1.9" + sources."minimatch-3.0.3" + sources."readable-stream-2.1.5" + sources."set-immediate-shim-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "sloc is a simple tool to count SLOC (source lines of code)"; + homepage = "https://github.com/flosse/sloc#readme"; + license = "MIT"; + }; + production = true; + }; + smartdc = nodeEnv.buildNodePackage { + name = "smartdc"; + packageName = "smartdc"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc/-/smartdc-8.1.0.tgz"; + sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585"; + }; + dependencies = [ + sources."assert-plus-0.1.5" + sources."lru-cache-2.2.0" + sources."nopt-2.0.0" + (sources."restify-4.0.3" // { + dependencies = [ + sources."lru-cache-2.7.3" + (sources."vasync-1.6.3" // { + dependencies = [ + sources."verror-1.6.0" + ]; + }) + ]; + }) + sources."bunyan-1.5.1" + sources."clone-0.1.6" + (sources."smartdc-auth-2.3.1" // { + dependencies = [ + sources."assert-plus-0.1.2" + sources."clone-0.1.5" + sources."dashdash-1.10.1" + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + ]; + }) + sources."once-1.3.0" + (sources."vasync-1.4.3" // { + dependencies = [ + (sources."jsprim-0.3.0" // { + dependencies = [ + sources."verror-1.3.3" + ]; + }) + ]; + }) + sources."verror-1.1.0" + sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" + ]; + }) + sources."cmdln-3.2.1" + sources."dashdash-1.7.3" + (sources."vasync-1.6.2" // { + dependencies = [ + sources."verror-1.1.0" + sources."extsprintf-1.0.0" + ]; + }) + sources."abbrev-1.0.9" + sources."backoff-2.5.0" + sources."csv-0.4.6" + sources."escape-regexp-component-1.0.2" + sources."formidable-1.0.17" + sources."http-signature-0.11.0" + sources."keep-alive-agent-0.0.1" + sources."mime-1.3.4" + sources."negotiator-0.5.3" + sources."node-uuid-1.4.7" + sources."once-1.4.0" + sources."qs-3.1.0" + sources."semver-4.3.6" + sources."spdy-1.32.5" + sources."tunnel-agent-0.4.3" + (sources."verror-1.8.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."dtrace-provider-0.6.0" + sources."precond-0.2.3" + sources."csv-generate-0.0.6" + sources."csv-parse-1.1.7" + sources."stream-transform-0.1.1" + sources."csv-stringify-0.0.8" + sources."asn1-0.1.11" + sources."ctype-0.5.3" + sources."wrappy-1.0.2" + sources."extsprintf-1.2.0" + sources."core-util-is-1.0.2" + sources."nan-2.4.0" + sources."mv-2.1.1" + sources."safe-json-stringify-1.0.3" + sources."mkdirp-0.5.1" + sources."ncp-2.0.0" + sources."rimraf-2.4.5" + sources."minimist-0.0.8" + sources."glob-6.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."path-is-absolute-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."sshpk-agent-1.2.1" + (sources."sshpk-1.7.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + ]; + }) + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."verror-1.3.6" + ]; + }) + sources."json-schema-0.2.3" + sources."readable-stream-2.1.5" + sources."buffer-shims-1.0.0" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Client SDK and CLI for the Joyent SmartDataCenter API"; + homepage = "https://github.com/joyent/node-smartdc#readme"; + }; + production = true; + }; + stylus = nodeEnv.buildNodePackage { + name = "stylus"; + packageName = "stylus"; + version = "0.54.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz"; + sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; + }; + dependencies = [ + sources."css-parse-1.7.0" + sources."mkdirp-0.5.1" + sources."debug-2.2.0" + sources."sax-0.5.8" + sources."glob-7.0.6" + sources."source-map-0.1.43" + sources."minimist-0.0.8" + sources."ms-0.7.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."amdefine-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Robust, expressive, and feature-rich CSS superset"; + homepage = https://github.com/stylus/stylus; + license = "MIT"; + }; + production = true; + }; + svgo = nodeEnv.buildNodePackage { + name = "svgo"; + packageName = "svgo"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; + sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; + }; + dependencies = [ + sources."sax-1.2.1" + sources."coa-1.0.1" + sources."js-yaml-3.6.1" + sources."colors-1.1.2" + sources."whet.extend-0.9.9" + sources."mkdirp-0.5.1" + sources."csso-2.2.1" + sources."q-1.4.1" + sources."argparse-1.0.9" + sources."esprima-2.7.3" + sources."sprintf-js-1.0.3" + sources."minimist-0.0.8" + sources."clap-1.1.1" + sources."source-map-0.5.6" + sources."chalk-1.1.3" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Nodejs-based tool for optimizing SVG vector graphics files"; + homepage = https://github.com/svg/svgo; + license = "MIT"; + }; + production = true; + }; + titanium = nodeEnv.buildNodePackage { + name = "titanium"; + packageName = "titanium"; + version = "5.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; + sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.1.2" + (sources."fields-0.1.24" // { + dependencies = [ + sources."colors-0.6.2" + ]; + }) + sources."humanize-0.0.9" + sources."longjohn-0.2.9" + sources."moment-2.10.6" + (sources."node-appc-0.2.31" // { + dependencies = [ + sources."request-2.61.0" + sources."semver-5.0.1" + ]; + }) + (sources."request-2.62.0" // { + dependencies = [ + sources."qs-5.1.0" + ]; + }) + sources."semver-5.0.3" + sources."sprintf-0.1.5" + sources."temp-0.8.3" + (sources."winston-1.0.2" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + sources."wrench-1.5.8" + sources."keypress-0.2.1" + sources."source-map-support-0.3.2" + sources."source-map-0.1.32" + sources."amdefine-1.0.0" + sources."adm-zip-0.4.7" + sources."diff-2.1.0" + sources."node-uuid-1.4.3" + sources."optimist-0.6.1" + (sources."uglify-js-2.4.24" // { + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.1.34" + ]; + }) + sources."xmldom-0.1.19" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."bl-1.0.3" + sources."caseless-0.11.0" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + sources."async-2.1.2" + ]; + }) + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."qs-4.0.0" + sources."tunnel-agent-0.4.3" + sources."tough-cookie-2.3.2" + sources."http-signature-0.11.0" + sources."oauth-sign-0.8.2" + sources."hawk-3.1.3" + sources."aws-sign2-0.5.0" + sources."stringstream-0.0.5" + sources."combined-stream-1.0.5" + sources."isstream-0.1.2" + sources."har-validator-1.8.0" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."lodash-4.16.4" + sources."mime-db-1.24.0" + sources."punycode-1.4.1" + sources."assert-plus-0.1.5" + sources."asn1-0.1.11" + sources."ctype-0.5.3" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."delayed-stream-1.0.0" + sources."bluebird-2.11.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.5.4" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."camelcase-1.2.1" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."pkginfo-0.3.1" + sources."stack-trace-0.0.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Appcelerator Titanium Command line"; + homepage = "https://github.com/appcelerator/titanium#readme"; + license = "Apache-2.0"; + }; + production = true; + }; + typescript = nodeEnv.buildNodePackage { + name = "typescript"; + packageName = "typescript"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.6.tgz"; + sha1 = "5385499ac9811508c2c43e0ea07a1ddca435e111"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "TypeScript is a language for application scale JavaScript development"; + homepage = http://typescriptlang.org/; + license = "Apache-2.0"; + }; + production = true; + }; + uglify-js = nodeEnv.buildNodePackage { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"; + sha1 = "a295a0de12b6a650c031c40deb0dc40b14568bd2"; + }; + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."wordwrap-0.0.2" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript parser, mangler/compressor and beautifier toolkit"; + homepage = http://lisperator.net/uglifyjs; + license = "BSD-2-Clause"; + }; + production = true; + }; + ungit = nodeEnv.buildNodePackage { + name = "ungit"; + packageName = "ungit"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ungit/-/ungit-0.10.3.tgz"; + sha1 = "7d4635b9a359c8db06c313374544f27a3890f63c"; + }; + dependencies = [ + sources."async-2.0.1" + sources."bluebird-3.3.5" + sources."blueimp-md5-2.3.1" + sources."body-parser-1.15.2" + sources."color-0.11.3" + sources."cookie-parser-1.4.3" + sources."crossroads-0.12.2" + sources."diff2html-1.2.0" + (sources."express-4.13.4" // { + dependencies = [ + sources."cookie-0.1.5" + sources."qs-4.0.0" + ]; + }) + (sources."express-session-1.13.0" // { + dependencies = [ + sources."cookie-0.2.3" + ]; + }) + sources."forever-monitor-1.1.0" + sources."getmac-1.2.1" + sources."hasher-1.2.0" + sources."keen.io-0.1.3" + sources."knockout-3.4.0" + sources."lodash-4.12.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.13.0" + (sources."npm-3.9.6" // { + dependencies = [ + sources."request-2.72.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."hawk-3.1.3" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."qs-6.1.0" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."npm-registry-client-7.1.2" // { + dependencies = [ + sources."request-2.76.0" + sources."retry-0.8.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."hawk-3.1.3" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + sources."octicons-3.5.0" + sources."open-0.0.5" + sources."os-homedir-1.0.2" + sources."passport-0.3.2" + sources."passport-local-1.0.0" + (sources."raven-0.11.0" // { + dependencies = [ + sources."cookie-0.1.0" + sources."stack-trace-0.0.7" + ]; + }) + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."rimraf-2.5.4" + sources."semver-5.1.1" + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."send-0.13.2" + sources."http-errors-1.3.1" + sources."statuses-1.2.1" + ]; + }) + sources."signals-1.0.0" + sources."snapsvg-0.4.0" + sources."socket.io-1.4.8" + (sources."superagent-0.21.0" // { + dependencies = [ + sources."qs-1.2.0" + sources."mime-1.2.11" + sources."methods-1.0.1" + sources."extend-1.2.1" + sources."form-data-0.1.3" + sources."readable-stream-1.0.27-1" + sources."async-0.9.2" + sources."isarray-0.0.1" + ]; + }) + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + (sources."winston-2.2.0" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + sources."pkginfo-0.3.1" + ]; + }) + sources."yargs-4.7.1" + sources."bytes-2.4.0" + sources."content-type-1.0.2" + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."http-errors-1.5.0" + sources."iconv-lite-0.4.13" + sources."on-finished-2.3.0" + sources."qs-6.2.0" + sources."raw-body-2.1.7" + sources."type-is-1.6.13" + sources."ms-0.7.1" + sources."inherits-2.0.1" + sources."setprototypeof-1.0.1" + sources."statuses-1.3.0" + sources."ee-first-1.1.1" + sources."unpipe-1.0.0" + sources."media-typer-0.3.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" + sources."clone-1.0.2" + sources."color-convert-1.5.0" + sources."color-string-0.3.0" + sources."color-name-1.1.1" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."diff-2.2.3" + sources."accepts-1.2.13" + sources."array-flatten-1.1.1" + sources."content-disposition-0.5.1" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."finalhandler-0.4.1" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.0.10" + sources."range-parser-1.0.3" + (sources."send-0.13.1" // { + dependencies = [ + sources."http-errors-1.3.1" + sources."statuses-1.2.1" + ]; + }) + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + sources."negotiator-0.5.3" + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + sources."destroy-1.0.4" + sources."mime-1.3.4" + sources."crc-3.4.0" + sources."on-headers-1.0.1" + sources."uid-safe-2.0.0" + sources."base64-url-1.2.1" + (sources."broadway-0.2.10" // { + dependencies = [ + sources."winston-0.7.2" + sources."utile-0.2.1" + sources."async-0.2.10" + sources."pkginfo-0.3.1" + sources."request-2.16.6" + sources."mime-1.2.11" + sources."qs-0.5.6" + ]; + }) + sources."minimatch-0.0.5" + sources."pkginfo-0.4.0" + sources."ps-tree-0.0.3" + sources."watch-0.5.1" + (sources."utile-0.1.7" // { + dependencies = [ + sources."async-0.1.22" + sources."ncp-0.2.7" + sources."rimraf-1.0.9" + ]; + }) + (sources."cliff-0.1.8" // { + dependencies = [ + sources."winston-0.6.2" + sources."async-0.1.22" + sources."pkginfo-0.2.3" + ]; + }) + sources."eventemitter2-0.4.14" + (sources."nconf-0.6.9" // { + dependencies = [ + sources."async-0.2.9" + ]; + }) + sources."colors-0.6.2" + sources."eyes-0.1.8" + sources."cycle-1.0.3" + sources."request-2.9.203" + sources."stack-trace-0.0.9" + sources."ini-1.3.4" + sources."optimist-0.6.0" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + (sources."form-data-0.0.10" // { + dependencies = [ + sources."mime-1.2.11" + sources."async-0.2.10" + ]; + }) + sources."hawk-0.10.2" + sources."node-uuid-1.4.7" + sources."cookie-jar-0.2.0" + sources."aws-sign-0.2.0" + sources."oauth-sign-0.2.0" + sources."forever-agent-0.2.0" + sources."tunnel-agent-0.2.0" + sources."json-stringify-safe-3.0.0" + sources."combined-stream-0.0.7" + sources."delayed-stream-0.0.5" + sources."hoek-0.7.6" + sources."boom-0.3.8" + sources."cryptiles-0.1.3" + sources."sntp-0.1.4" + sources."deep-equal-1.0.1" + sources."i-0.3.5" + sources."ncp-0.4.2" + sources."lru-cache-1.0.6" + (sources."event-stream-0.5.3" // { + dependencies = [ + sources."optimist-0.2.8" + ]; + }) + sources."extract-opts-3.3.1" + sources."eachr-3.2.0" + sources."editions-1.3.1" + sources."typechecker-4.3.0" + sources."underscore-1.5.2" + sources."abbrev-1.0.9" + sources."ansicolors-0.3.2" + sources."ansistyles-0.1.3" + sources."aproba-1.0.4" + sources."archy-1.0.0" + sources."chownr-1.0.1" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."config-chain-1.1.11" + sources."dezalgo-1.0.3" + sources."editor-1.0.0" + sources."fs-vacuum-1.2.9" + sources."fs-write-stream-atomic-1.0.8" + sources."fstream-1.0.10" + sources."fstream-npm-1.1.1" + (sources."glob-7.0.6" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."graceful-fs-4.1.9" + sources."has-unicode-2.0.1" + sources."hosted-git-info-2.1.5" + sources."iferr-0.1.5" + sources."inflight-1.0.6" + (sources."init-package-json-1.9.4" // { + dependencies = [ + sources."glob-6.0.4" + sources."minimatch-3.0.3" + ]; + }) + sources."lockfile-1.0.2" + sources."lodash._baseuniq-4.6.0" + sources."lodash.clonedeep-4.3.2" + sources."lodash.union-4.4.0" + sources."lodash.uniq-4.3.0" + sources."lodash.without-4.2.0" + (sources."node-gyp-3.3.1" // { + dependencies = [ + (sources."glob-4.5.3" // { + dependencies = [ + sources."minimatch-2.0.10" + ]; + }) + sources."minimatch-1.0.0" + sources."lru-cache-2.7.3" + ]; + }) + sources."nopt-3.0.6" + sources."normalize-git-url-3.0.2" + sources."normalize-package-data-2.3.5" + sources."npm-cache-filename-1.0.2" + sources."npm-install-checks-3.0.0" + sources."npm-package-arg-4.1.1" + sources."npm-user-validate-0.1.5" + sources."npmlog-2.0.4" + sources."once-1.3.3" + sources."opener-1.4.2" + sources."osenv-0.1.3" + sources."path-is-inside-1.0.2" + sources."read-1.0.7" + sources."read-cmd-shim-1.0.1" + sources."read-installed-4.0.3" + (sources."read-package-json-2.0.4" // { + dependencies = [ + sources."glob-6.0.4" + sources."minimatch-3.0.3" + ]; + }) + sources."read-package-tree-5.1.5" + sources."readable-stream-2.1.5" + sources."realize-package-specifier-3.0.3" + sources."retry-0.9.0" + sources."sha-2.0.1" + sources."slide-1.1.6" + sources."sorted-object-2.0.1" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."text-table-0.2.0" + sources."uid-number-0.0.6" + sources."umask-1.1.0" + sources."unique-filename-1.1.0" + sources."validate-npm-package-name-2.2.2" + sources."which-1.2.11" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.1.4" + sources."ansi-regex-2.0.0" + sources."debuglog-1.0.1" + sources."imurmurhash-0.1.4" + sources."lodash._baseindexof-3.1.0" + sources."lodash._bindcallback-3.0.1" + sources."lodash._cacheindexof-3.0.2" + sources."lodash._createcache-3.1.2" + sources."lodash._getnative-3.9.1" + sources."lodash.restparam-3.6.1" + sources."readdir-scoped-modules-1.0.2" + sources."validate-npm-package-license-3.0.1" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."proto-list-1.2.4" + sources."asap-2.0.5" + (sources."fstream-ignore-1.0.5" // { + dependencies = [ + sources."minimatch-3.0.3" + ]; + }) + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."path-is-absolute-1.0.1" + sources."promzard-0.3.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."lodash._baseclone-4.5.7" + sources."lodash._baseflatten-4.2.1" + sources."lodash.rest-4.0.5" + sources."lodash._basedifference-4.5.0" + sources."path-array-1.0.1" + sources."sigmund-1.0.1" + sources."array-index-1.0.0" + sources."es6-symbol-3.1.0" + sources."d-0.1.1" + sources."es5-ext-0.10.12" + sources."es6-iterator-2.0.0" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" + sources."ansi-0.3.1" + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."os-tmpdir-1.0.2" + sources."mute-stream-0.0.6" + sources."util-extend-1.0.3" + sources."json-parse-helpfulerror-1.0.3" + sources."jju-1.3.0" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."caseless-0.11.0" + sources."extend-3.0.0" + sources."har-validator-2.0.6" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.2.2" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."block-stream-0.0.9" + sources."unique-slug-2.0.0" + sources."builtins-0.0.7" + sources."isexe-1.1.2" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + ]; + }) + sources."typedarray-0.0.6" + sources."asynckit-0.4.0" + sources."punycode-1.4.1" + sources."passport-strategy-1.0.0" + sources."pause-0.0.1" + sources."lsmod-1.0.0" + sources."deep-extend-0.4.1" + sources."strip-json-comments-1.0.4" + sources."eve-0.4.2" + (sources."engine.io-1.6.11" // { + dependencies = [ + sources."accepts-1.1.4" + sources."mime-types-2.0.14" + sources."negotiator-0.4.9" + sources."mime-db-1.12.0" + ]; + }) + (sources."socket.io-parser-2.2.6" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + (sources."socket.io-client-1.4.8" // { + dependencies = [ + sources."component-emitter-1.2.0" + ]; + }) + (sources."socket.io-adapter-0.4.0" // { + dependencies = [ + (sources."socket.io-parser-2.2.2" // { + dependencies = [ + sources."debug-0.7.4" + ]; + }) + sources."json3-3.2.6" + sources."isarray-0.0.1" + ]; + }) + (sources."has-binary-0.1.7" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."base64id-0.1.0" + sources."ws-1.1.0" + (sources."engine.io-parser-1.2.4" // { + dependencies = [ + sources."has-binary-0.1.6" + sources."isarray-0.0.1" + ]; + }) + sources."options-0.0.6" + sources."ultron-1.0.2" + sources."after-0.8.1" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.2" + sources."blob-0.0.4" + sources."utf8-2.1.0" + sources."json3-3.3.2" + sources."component-emitter-1.1.2" + sources."benchmark-1.0.0" + (sources."engine.io-client-1.6.11" // { + dependencies = [ + sources."ws-1.0.1" + ]; + }) + sources."component-bind-1.0.0" + sources."object-component-0.0.3" + sources."indexof-0.0.1" + sources."parseuri-0.0.4" + sources."to-array-0.1.4" + sources."backo2-1.0.2" + sources."has-cors-1.1.0" + sources."xmlhttprequest-ssl-1.5.1" + sources."parsejson-0.0.1" + sources."parseqs-0.0.2" + sources."component-inherit-0.0.3" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + sources."formidable-1.0.14" + sources."cookiejar-2.0.1" + sources."reduce-component-1.0.1" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" + sources."decamelize-1.2.0" + sources."lodash.assign-4.2.0" + sources."os-locale-1.4.0" + sources."pkg-conf-1.1.3" + sources."read-pkg-up-1.0.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-1.0.0" + sources."string-width-1.0.2" + sources."window-size-0.2.0" + sources."y18n-3.2.1" + sources."yargs-parser-2.4.1" + sources."wrap-ansi-2.0.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."find-up-1.1.2" + sources."load-json-file-1.1.0" + sources."object-assign-4.1.0" + sources."symbol-0.2.3" + sources."path-exists-2.1.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."read-pkg-1.1.0" + sources."path-type-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Git made easy"; + homepage = "https://github.com/FredrikNoren/ungit#readme"; + license = "MIT"; + }; + production = true; + }; + webdrvr = nodeEnv.buildNodePackage { + name = "webdrvr"; + packageName = "webdrvr"; + version = "2.43.0-1"; + src = fetchurl { + url = "https://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz"; + sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225"; + }; + dependencies = [ + sources."adm-zip-0.4.7" + sources."kew-0.1.7" + sources."mkdirp-0.3.5" + sources."npmconf-0.1.16" + (sources."phantomjs-1.9.20" // { + dependencies = [ + sources."kew-0.7.0" + ]; + }) + sources."tmp-0.0.29" + sources."follow-redirects-0.0.3" + (sources."config-chain-1.1.11" // { + dependencies = [ + sources."ini-1.3.4" + ]; + }) + sources."inherits-2.0.3" + sources."once-1.3.3" + sources."osenv-0.0.3" + sources."nopt-2.2.1" + sources."semver-2.3.2" + sources."ini-1.1.0" + sources."proto-list-1.2.4" + sources."wrappy-1.0.2" + sources."abbrev-1.0.9" + (sources."extract-zip-1.5.0" // { + dependencies = [ + sources."mkdirp-0.5.0" + ]; + }) + sources."fs-extra-0.26.7" + sources."hasha-2.2.0" + sources."progress-1.1.8" + sources."request-2.67.0" + sources."request-progress-2.0.1" + sources."which-1.2.11" + sources."concat-stream-1.5.0" + sources."debug-0.7.4" + sources."yauzl-2.4.1" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."minimist-0.0.8" + sources."fd-slicer-1.0.1" + sources."pend-1.2.0" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."path-is-absolute-1.0.1" + sources."rimraf-2.5.4" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."minimatch-3.0.3" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."is-stream-1.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."bl-1.0.3" + sources."caseless-0.11.0" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."qs-5.2.1" + sources."tunnel-agent-0.4.3" + sources."tough-cookie-2.2.2" + sources."http-signature-1.1.1" + sources."oauth-sign-0.8.2" + sources."hawk-3.1.3" + sources."aws-sign2-0.6.0" + sources."stringstream-0.0.5" + sources."combined-stream-1.0.5" + sources."isstream-0.1.2" + sources."is-typedarray-1.0.0" + sources."har-validator-2.0.6" + sources."async-2.1.2" + sources."lodash-4.16.4" + sources."mime-db-1.24.0" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."delayed-stream-1.0.0" + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."throttleit-1.0.0" + sources."isexe-1.1.2" + sources."os-tmpdir-1.0.2" + sources."underscore-1.8.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; + homepage = https://github.com/uxebu/webdrvr; + license = "MIT"; + }; + production = true; + }; + webpack = nodeEnv.buildNodePackage { + name = "webpack"; + packageName = "webpack"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-1.13.3.tgz"; + sha1 = "e79c46fe5a37c5ca70084ba0894c595cdcb42815"; + }; + dependencies = [ + sources."async-1.5.2" + sources."clone-1.0.2" + (sources."enhanced-resolve-0.9.1" // { + dependencies = [ + sources."memory-fs-0.2.0" + ]; + }) + sources."acorn-3.3.0" + sources."interpret-0.6.6" + sources."loader-utils-0.2.16" + sources."memory-fs-0.3.0" + sources."mkdirp-0.5.1" + (sources."node-libs-browser-0.6.0" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) + sources."optimist-0.6.1" + sources."supports-color-3.1.2" + sources."tapable-0.1.10" + (sources."uglify-js-2.7.4" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + (sources."watchpack-0.2.9" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + (sources."webpack-core-0.6.8" // { + dependencies = [ + sources."source-map-0.4.4" + ]; + }) + sources."graceful-fs-4.1.9" + sources."big.js-3.1.3" + sources."emojis-list-2.1.0" + sources."json5-0.5.0" + sources."object-assign-4.1.0" + sources."errno-0.1.4" + sources."readable-stream-2.1.5" + sources."prr-0.0.0" + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."minimist-0.0.8" + sources."assert-1.4.1" + sources."browserify-zlib-0.1.4" + sources."buffer-4.9.1" + sources."console-browserify-1.1.0" + sources."constants-browserify-0.0.1" + sources."crypto-browserify-3.2.8" + sources."domain-browser-1.1.7" + sources."events-1.1.1" + sources."http-browserify-1.7.0" + sources."https-browserify-0.0.0" + sources."os-browserify-0.1.2" + sources."path-browserify-0.0.0" + sources."process-0.11.9" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + (sources."stream-browserify-1.0.0" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + ]; + }) + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.10.3" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."pako-0.2.9" + sources."base64-js-1.2.0" + sources."ieee754-1.1.8" + sources."date-now-0.1.4" + sources."pbkdf2-compat-2.0.1" + sources."ripemd160-0.2.0" + sources."sha.js-2.2.6" + sources."Base64-0.2.1" + sources."querystring-0.2.0" + sources."indexof-0.0.1" + sources."wordwrap-0.0.3" + sources."has-flag-1.0.0" + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.0.4" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.4" + sources."chokidar-1.6.1" + sources."anymatch-1.3.0" + sources."async-each-1.0.1" + sources."glob-parent-2.0.0" + sources."is-binary-path-1.0.1" + sources."is-glob-2.0.1" + sources."path-is-absolute-1.0.1" + sources."readdirp-2.1.0" + sources."fsevents-1.0.14" + sources."arrify-1.0.1" + sources."micromatch-2.3.11" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.0" + sources."is-extglob-1.0.0" + sources."normalize-path-2.0.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.0.1" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."randomatic-1.1.5" + sources."is-posix-bracket-0.1.1" + sources."for-own-0.1.4" + sources."is-extendable-0.1.1" + sources."for-in-0.1.6" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" + sources."binary-extensions-1.7.0" + sources."minimatch-3.0.3" + sources."set-immediate-shim-1.0.1" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."nan-2.4.0" + sources."node-pre-gyp-0.6.31" + sources."nopt-3.0.6" + sources."npmlog-4.0.0" + (sources."rc-1.1.6" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."request-2.76.0" + sources."rimraf-2.5.4" + sources."semver-5.3.0" + sources."tar-2.2.1" + (sources."tar-pack-3.3.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."abbrev-1.0.9" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.0.4" + sources."has-color-0.1.7" + sources."has-unicode-2.0.1" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."ansi-regex-2.0.0" + sources."deep-extend-0.4.1" + sources."ini-1.3.4" + sources."strip-json-comments-1.0.4" + sources."aws-sign2-0.6.0" + sources."aws4-1.5.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.1.1" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.3.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) + sources."commander-2.9.0" + sources."is-my-json-valid-2.15.0" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."wrappy-1.0.2" + sources."block-stream-0.0.9" + sources."fstream-1.0.10" + sources."debug-2.2.0" + sources."fstream-ignore-1.0.5" + sources."uid-number-0.0.6" + sources."ms-0.7.1" + sources."source-list-map-0.1.6" + sources."amdefine-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; + homepage = https://github.com/webpack/webpack; + license = "MIT"; + }; + production = true; + }; + wring = nodeEnv.buildNodePackage { + name = "wring"; + packageName = "wring"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; + sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Extract content from websites using CSS Selectors and XPath"; + homepage = "https://github.com/osener/wring#readme"; + license = "MIT"; + }; + production = true; + }; +} \ No newline at end of file From 416eb6053e2fe985e6c7d995e2ca333e488d81ce Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Sun, 30 Oct 2016 09:59:56 +0100 Subject: [PATCH 014/336] node-packages: fix reference --- pkgs/development/node-packages/default-v6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 00dce5966aa..12fbaced770 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -1,7 +1,7 @@ {pkgs, system, nodejs}: let - nodePackages = import ./composition-v5.nix { + nodePackages = import ./composition-v6.nix { inherit pkgs system nodejs; }; in From caa10b72333a7cf182001aa1a5fe94ccdf81aaf1 Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Sun, 30 Oct 2016 14:40:48 +0100 Subject: [PATCH 015/336] nodejs: set default to v6 --- 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 fc0d7f1f606..ac920dff74d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2425,7 +2425,7 @@ in libtool = darwin.cctools; }; - nodejs = nodejs-4_x; + nodejs = nodejs-6_x; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; From e2372502d3d0503711ea792a74292373286e5c8f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 30 Oct 2016 02:52:47 +0200 Subject: [PATCH 016/336] netcat: make netcat-openbsd the default netcat (#19411) The motivation for this change is the following: As gnu-netcat, e. g. does not support ipv6, it is not suitable as default netcat. This commit also fixes all obvious build issues caused by this change. --- nixos/tests/hibernate.nix | 4 ++-- nixos/tests/virtualbox.nix | 12 ++++++------ pkgs/applications/misc/playonlinux/default.nix | 4 ++-- pkgs/build-support/vm/windows/bootstrap.nix | 4 ++-- pkgs/build-support/vm/windows/controller/default.nix | 6 +++--- pkgs/build-support/vm/windows/default.nix | 2 +- .../xfce/panel-plugins/xfce4-sensors-plugin.nix | 6 +++--- .../networking/{netcat => netcat-gnu}/default.nix | 0 pkgs/top-level/all-packages.nix | 4 +++- 9 files changed, 22 insertions(+), 20 deletions(-) rename pkgs/tools/networking/{netcat => netcat-gnu}/default.nix (100%) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 787929f8904..7616a75b021 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: { networking.firewall.allowedTCPPorts = [ 4444 ]; - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444"; + systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444"; }; probe = { config, lib, pkgs, ...}: { @@ -36,7 +36,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc -c machine 4444"); + $probe->waitUntilSucceeds("echo test | nc machine 4444"); ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 02a8fc68028..376c4f21dc0 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -299,9 +299,9 @@ let -pf /run/dhclient.pid \ -v eth0 eth1 - otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)" + otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)" ${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP" - echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || : + echo "$otherIP reachable" | ${pkgs.netcat}/bin/nc -l 5678 || : ''; sysdDetectVirt = pkgs: '' @@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest { my $test1IP = waitForIP_test1 1; my $test2IP = waitForIP_test2 1; - $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234"); - $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234"); + $machine->succeed("echo '$test2IP' | nc '$test1IP' 1234"); + $machine->succeed("echo '$test1IP' | nc '$test2IP' 1234"); - $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2"); - $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2"); shutdownVM_test1; shutdownVM_test2; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 4050f8bf589..b604905320b 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -7,7 +7,7 @@ , gnupg1compat , icoutils , imagemagick -, netcat +, netcat-gnu , p7zip , python2Packages , unzip @@ -34,7 +34,7 @@ let gnupg1compat icoutils imagemagick - netcat + netcat-gnu p7zip unzip wget diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix index ebea819b191..3b06d8f4749 100644 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd -, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu +, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu , samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep }: @@ -10,7 +10,7 @@ with stdenv.lib; let controller = import ./controller { inherit stdenv writeScript vmTools makeInitrd; - inherit samba vde2 openssh socat netcat coreutils gzip gnugrep; + inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep; }; mkCygwinImage = import ./cygwin-iso { diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 06a0a229306..9009702113e 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,5 @@ { stdenv, writeScript, vmTools, makeInitrd -, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip +, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip }: { sshKey @@ -79,7 +79,7 @@ let ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' echo -n "Waiting for Windows installation to finish..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . # Print a dot every 10 seconds only to shorten line length. ${coreutils}/bin/sleep 10 @@ -118,7 +118,7 @@ let ${samba}/sbin/smbd -D echo -n "Waiting for Windows VM to become available..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . ${coreutils}/bin/sleep 1 done diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index f9f1d75c70d..c668e7569a4 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -3,7 +3,7 @@ pkgs: let bootstrapper = import ./bootstrap.nix { inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd; - inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba; + inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba; inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph; inherit (pkgs) gnugrep; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 770f3449023..3314d313ad2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat + libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu }: stdenv.mkDerivation rec { @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { libnotify lm_sensors hddtemp - netcat + netcat-gnu ]; enableParallelBuilding = true; configureFlags = [ "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat}/bin/netcat" + "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; meta = { diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat-gnu/default.nix similarity index 100% rename from pkgs/tools/networking/netcat/default.nix rename to pkgs/tools/networking/netcat-gnu/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc0d7f1f606..df4f8d066ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2795,7 +2795,9 @@ in netboot = callPackage ../tools/networking/netboot {}; - netcat = callPackage ../tools/networking/netcat { }; + netcat = netcat-openbsd; + + netcat-gnu = callPackage ../tools/networking/netcat-gnu { }; netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; From bbe9159725d73a77922953b3cd17c862451ba59a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 30 Oct 2016 02:54:19 +0200 Subject: [PATCH 017/336] netcat-openbsd: install man page --- pkgs/tools/networking/netcat-openbsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index e71abcd8a2c..9933b512006 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm0755 nc $out/bin/nc + install -Dm0644 nc.1 $out/share/man/man1/nc.1 ''; meta = { From 1f978a50a8aecf2c447dec7fd8cb688a08ebf703 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 30 Oct 2016 13:14:15 -0200 Subject: [PATCH 018/336] cherrytree: 0.37.1 -> 0.37.6 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 43e41284f14..324fa12dc46 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.37.1"; + version = "0.37.6"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd"; + sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s"; }; buildInputs = with pythonPackages; From 6c9e8efadc02699e457200b42f3951206cfa0b6e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Oct 2016 17:53:56 +0100 Subject: [PATCH 019/336] x42-plugins: 20160619 -> 20160825 --- .../audio/x42-plugins/default.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 2c3d4b91f25..64ffeced13d 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, fetchgit +{ stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20160619"; + version = "20160825"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; + sha256 = "13ln5ccmrrc07ykfp040389av60dlgqz1kh6vfjkga6sq7z51msr"; }; - buildInputs = [ - mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate - lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver - ]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; - makeFlags = [ - "PREFIX=$(out)" - "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" - "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" - ]; + makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; - meta = with stdenv.lib; { - description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; - maintainers = with maintainers; [ magnetophon ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + patchPhase = '' + patchShebangs ./stepseq.lv2/gridgen.sh + sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile + ''; + + meta = with stdenv.lib; + { description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; } From 1cb54a7dd0dc6527949ba889d7cffd979c444e73 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 30 Oct 2016 20:47:13 +0300 Subject: [PATCH 020/336] bumblebee: backport critical libkmod.patch --- pkgs/tools/X11/bumblebee/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 480c929e941..ec279f56cd8 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -20,6 +20,7 @@ , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib +, automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? @@ -48,6 +49,15 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + modprobePatch = fetchurl { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; + sha256 = "0x9qvhw6sn606dqcp3394irj6jjhw3h75k3lpbys6gha1yshgjps"; + }; + libkmodPatch = fetchurl { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; + sha256 = "0j2v0lncjfn2nw3324q3n69lw3yz3hah6bscc8xn9a2df2dcawj1"; + }; + in stdenv.mkDerivation rec { name = "bumblebee-${version}"; @@ -56,7 +66,12 @@ in stdenv.mkDerivation rec { sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./nixos.patch ]; + patches = [ + ./nixos.patch + + modprobePatch + libkmodPatch + ]; # By default we don't want to use a display device nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' @@ -96,7 +111,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ]; + buildInputs = [ libX11 glib libbsd ] + ++ [ kmod automake111x autoconf ]; nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; # The order of LDPATH is very specific: First X11 then the host From de98c8d791fd18121dca226f86f43d2f24d3fa65 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 15 Oct 2016 07:52:42 +0200 Subject: [PATCH 021/336] kdevelop: 5.0.0 -> 5.0.2 --- .../editors/kdevelop5/kdevelop.nix | 19 +++++++++++-------- .../editors/kdevelop5/kdevplatform.nix | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 845a02bebf6..cf1d70350ba 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper -, qtquickcontrols, qtwebkit +, qtquickcontrols, qtwebkit, qttools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor -, threadweaver, kxmlgui, kwindowsystem +, threadweaver, kxmlgui, kwindowsystem, grantlee , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info -, libksysguard, llvmPackages +, libksysguard, llvmPackages, makeWrapper }: let pname = "kdevelop"; - version = "5.0"; - dirVersion = "5.0.0"; + version = "5.0.2"; + dirVersion = "5.0.2"; in stdenv.mkDerivation rec { @@ -18,22 +18,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c"; + sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666"; }; - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ + cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper + ]; buildInputs = [ qtquickcontrols qtwebkit kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor - threadweaver kxmlgui kwindowsystem plasma-framework krunner + threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner kdevplatform kdevelop-pg-qt shared_mime_info libksysguard llvmPackages.llvm llvmPackages.clang-unwrapped ]; postInstall = '' wrapQtProgram "$out/bin/kdevelop" + wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 52af0a4e05d..d8a7e7f2b9e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -6,8 +6,8 @@ let pname = "kdevplatform"; - version = "5.0"; - dirVersion = "5.0.0"; + version = "5.0.2"; + dirVersion = "5.0.2"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10"; + sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec"; }; nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; From 3d99eea85208d4f491e3a5c241b03d2c8d0c4125 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sun, 30 Oct 2016 12:35:57 -0400 Subject: [PATCH 022/336] docs: use overrideAttrs instead of overrideDerivation --- .../configuration/customizing-packages.xml | 25 ++++++++++--------- nixos/modules/config/debug-info.nix | 6 ++--- nixos/modules/services/editors/emacs.xml | 6 ++--- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 6ee7a95dc6f..f938d6dd67e 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -42,29 +42,30 @@ construction, so without them, elements.) Even greater customisation is possible using the function -overrideDerivation. While the +overrideAttrs. While the override mechanism above overrides the arguments of -a package function, overrideDerivation allows -changing the result of the function. This +a package function, overrideAttrs allows +changing the attributes of the function. This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = - [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) - ]; +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; -Here, overrideDerivation takes the Nix derivation +Here, overrideAttrs takes the Nix derivation specified by pkgs.emacs and produces a new derivation in which the original’s name and src attribute have been replaced by the given -values. The original attributes are accessible via -attrs. +values by re-calling stdenv.mkDerivation. +The original attributes are accessible via the function argument, +which is conventionally named oldAttrs. The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 671a59f52f6..49991d22a93 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -17,12 +17,10 @@ with lib; where tools such as gdb can find them. If you need debug symbols for a package that doesn't provide them by default, you can enable them as follows: - nixpkgs.config.packageOverrides = pkgs: { - hello = pkgs.lib.overrideDerivation pkgs.hello (attrs: { - outputs = attrs.outputs or ["out"] ++ ["debug"]; - buildInputs = attrs.buildInputs ++ [<nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh>]; + hello = pkgs.hello.overrideAttrs (oldAttrs: { + separateDebugInfo = true; }); }; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index bcaa8b8df3d..e03f6046de8 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -356,14 +356,14 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides {} }: let - myEmacs = pkgs.lib.overrideDerivation (pkgs.emacs.override { + myEmacs = (pkgs.emacs.override { # Use gtk3 instead of the default gtk2 withGTK3 = true; withGTK2 = false; - }) (attrs: { + }).overrideAttrs (attrs: { # I don't want emacs.desktop file because I only use # emacsclient. - postInstall = attrs.postInstall + '' + postInstall = (attrs.postInstall or "") + '' rm $out/share/applications/emacs.desktop ''; }); From 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 30 Oct 2016 10:41:41 -0300 Subject: [PATCH 023/336] cc-wrapper: expand response files Fixes #11762 --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/utils.sh | 24 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 894ea95b5fa..6287f83ed37 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -23,7 +23,7 @@ getVersion=0 nonFlagArgs=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 -params=("$@") +expandResponseParams "$@" n=0 while [ $n -lt ${#params[*]} ]; do p=${params[n]} diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 28d73f046e6..391b5744d02 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -16,7 +16,7 @@ source @out@/nix-support/utils.sh # Optionally filter out paths not refering to the store. -params=("$@") +expandResponseParams "$@" if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then rest=() diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 3ab512d85c4..481d642f967 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -22,3 +22,27 @@ badPath() { "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" } + +expandResponseParams() { + local inparams=("$@") + local n=0 + local p + params=() + while [ $n -lt ${#inparams[*]} ]; do + p=${inparams[n]} + case $p in + @*) + if [ -e "${p:1}" ]; then + args=$(<"${p:1}") + eval 'for arg in '$args'; do params+=("$arg"); done' + else + params+=("$p") + fi + ;; + *) + params+=("$p") + ;; + esac + n=$((n + 1)) + done +} From f8a17768cd6049c6dcc3251ed512504b5cac91f0 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 31 Oct 2016 09:49:34 +0300 Subject: [PATCH 024/336] bumblebee: remove long time obsolete substitution --- pkgs/tools/X11/bumblebee/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index ec279f56cd8..116a7a014ea 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -90,13 +90,6 @@ in stdenv.mkDerivation rec { ''; preConfigure = '' - # Substitute the path to the actual modinfo program in module.c. - # Note: module.c also calls rmmod and modprobe, but those just have to - # be in PATH, and thus no action for them is required. - - substituteInPlace src/module.c \ - --replace "/sbin/modinfo" "${kmod}/sbin/modinfo" - # Don't use a special group, just reuse wheel. substituteInPlace configure \ --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' From ce90d094046e0374848bee8232f0c1f4b0bc3b81 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 29 Oct 2016 20:19:02 +0200 Subject: [PATCH 025/336] groovy: no easily conflicting files in top-level (#19872) --- pkgs/development/interpreters/groovy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 27368580de0..78d154bb654 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out + mkdir -p $out/share/doc/groovy rm bin/*.bat - mv * $out + mv {bin,conf,embeddable,grooid,indy,lib} $out + mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy @@ -27,8 +29,6 @@ stdenv.mkDerivation rec { done ''; - phases = "unpackPhase installPhase"; - meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; homepage = http://groovy-lang.org/; From 08ebb422c52c61190346f5289f7e918a8fd7f115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 31 Oct 2016 11:25:50 +0100 Subject: [PATCH 026/336] adb: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/adb.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/modules/programs/adb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 61596265124..08d73970408 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -61,6 +61,7 @@ ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix + ./programs/adb.nix ./programs/atop.nix ./programs/bash/bash.nix ./programs/blcr.nix diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix new file mode 100644 index 00000000000..9ba81899e58 --- /dev/null +++ b/nixos/modules/programs/adb.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options = { + programs.adb = { + enable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to configure system to use Android Debug Bridge (adb). + To grant access to a user, it must be part of adbusers group: + users.extraUsers.alice.extraGroups = ["adbusers"]; + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.programs.adb.enable { + services.udev.packages = [ pkgs.android-udev-rules ]; + environment.systemPackages = [ pkgs.androidenv.platformTools ]; + users.extraGroups.adbusers = {}; + }; +} From 830a9bf4fbe124e60fd1c2541249d8a7411f6312 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 31 Oct 2016 15:27:25 +0100 Subject: [PATCH 027/336] pythonPackages.filebrowser_safe: disable tests The distribution do not seem to include tests, and fails when trying to run them --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 185043b27e3..744af1ef137 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10706,6 +10706,9 @@ in { buildInputs = [ self.django ]; + # There is no test embedded + doCheck = false; + meta = { description = "A snapshot of django-filebrowser for the Mezzanine CMS"; longDescription = '' From 0f7decd0121af57fc60a63623d83b19c9dee1229 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 31 Oct 2016 16:08:13 +0100 Subject: [PATCH 028/336] pythonPackages.django_1_6: disable for python >= 3.4 django 1.6 does not support python>=3.4 --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 744af1ef137..71d1092d8f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9719,6 +9719,9 @@ in { name = "Django-${version}"; version = "1.6.11"; + # Support to python-3.4 and higher was introduced in django_1_7 + disabled = !(isPy26 || isPy27 || isPy33); + src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y"; From 8617a068b8ed7fa77356a518e79a12d37460c0ae Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 31 Oct 2016 16:09:19 +0100 Subject: [PATCH 029/336] pythonPackages.mezzanine: Fix template project This makes sure that the template project can be used and updated. Otherzise files copied from the store stay readonly and cannot be updated during the generation process. --- .../mezzanine/writable_settings.patch | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/mezzanine/writable_settings.patch diff --git a/pkgs/development/python-modules/mezzanine/writable_settings.patch b/pkgs/development/python-modules/mezzanine/writable_settings.patch new file mode 100644 index 00000000000..4b5be7b5950 --- /dev/null +++ b/pkgs/development/python-modules/mezzanine/writable_settings.patch @@ -0,0 +1,21 @@ +diff -Nur mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py +--- mezzanine-3.1.10/mezzanine/bin/mezzanine_project.py 2014-08-30 07:12:19.000000000 +0200 ++++ mezzanine-3.1.10-patched/mezzanine/bin/mezzanine_project.py 2016-10-31 14:47:30.982401818 +0100 +@@ -5,6 +5,7 @@ + from distutils.dir_util import copy_tree + from optparse import OptionParser + import os ++import stat + from shutil import move + from uuid import uuid4 + +@@ -61,6 +62,9 @@ + copy_tree(os.path.join(package_path, "project_template"), project_path) + move(local_settings_path + ".template", local_settings_path) + ++ os.chmod(local_settings_path, ++ os.stat(local_settings_path).st_mode | stat.S_IWRITE) ++ + # Generate a unique SECRET_KEY for the project's setttings module. + with open(local_settings_path, "r") as f: + data = f.read() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71d1092d8f8..b3077272050 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13967,6 +13967,7 @@ in { url = "https://github.com/stephenmcd/mezzanine/archive/${version}.tar.gz"; sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi"; }; + patches = [ ../development/python-modules/mezzanine/writable_settings.patch ]; disabled = isPyPy; From bca319d58df630ea4edba2b94df27d308f615b38 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 31 Oct 2016 17:47:50 +0100 Subject: [PATCH 030/336] idea.ruby-mine: 2016.2.4 -> 2016.2.5 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 96ed8532eae..75a7a78ef90 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -204,12 +204,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2016.2.4"; + version = "2016.2.5"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w"; + sha256 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p"; }; wmClass = "jetbrains-rubymine"; }; From 682c4c40a4d8641d95d58bddcfdfad7a87a92fa1 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 31 Oct 2016 17:49:44 +0100 Subject: [PATCH 031/336] idea.phpstorm: 2016.2.1 -> 2016.2.2 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 75a7a78ef90..1ce86e96c4d 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -264,12 +264,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.2.1"; + version = "2016.2.2"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0vgr0ds6z0y8qw2v55nr3pi5zb5x0n6pxm13hcp44iradns5kmbp"; + sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz"; }; wmClass = "jetbrains-phpstorm"; }; From 5142165d808076fd26fdd5c4a32d18d585ca40d0 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Mon, 31 Oct 2016 12:36:47 +0000 Subject: [PATCH 032/336] vega: init at 0.4.4 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 185043b27e3..c5eed1f8bde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -364,6 +364,30 @@ in { }; }; + vega = buildPythonPackage rec { + name = "vega-0.4.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/v/vega/${name}.tar.gz"; + sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; + }; + + propagatedBuildInputs = with self; [ jupyter_core pandas ]; + + meta = { + description = " An IPython/Jupyter widget for Vega and Vega-Lite."; + longDescription = '' + To use this you have to enter a nix-shell with vega. Then run: + + jupyter nbextension install --user --py vega + jupyter nbextension enable --user vega + ''; + homepage = https://github.com/vega/ipyvega; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ teh ]; + }; + }; acme_0_5_0 = buildPythonPackage rec { version = "0.5.0"; name = "acme-${version}"; From bca7914a44e403a65992b29456e8132b1302ebb7 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Mon, 31 Oct 2016 12:36:59 +0000 Subject: [PATCH 033/336] altair: init at 1.0.0 --- 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 c5eed1f8bde..3b1d7618e64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -364,6 +364,24 @@ in { }; }; + altair = buildPythonPackage rec { + name = "altair-1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/altair/${name}.tar.gz"; + sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r"; + }; + + propagatedBuildInputs = with self; [ vega pandas ipython traitlets ]; + + meta = { + description = "A declarative statistical visualization library for Python."; + homepage = https://github.com/altair-viz/altair; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ teh ]; + }; + }; vega = buildPythonPackage rec { name = "vega-0.4.4"; From b850914355e574791d4790c1b8ca9f3aee34df29 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 1 Nov 2016 00:28:04 +0200 Subject: [PATCH 034/336] skrooge2: 2.4.0 -> 2.5.0 --- pkgs/applications/office/skrooge/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix index f9be34efd95..6751e7d6d11 100644 --- a/pkgs/applications/office/skrooge/2.nix +++ b/pkgs/applications/office/skrooge/2.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "skrooge-${version}"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe"; + sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; From d9e1651911bc3652590961b8c520bf880a7d3e0e Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 31 Oct 2016 20:08:00 -0400 Subject: [PATCH 035/336] elpa-packages: 2016-10-31 --- .../editors/emacs-modes/elpa-generated.nix | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a9e2711711f..8c5b24e7ad8 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar"; - sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr"; + url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar"; + sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -471,10 +471,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.11.tar"; - sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n"; + url = "https://elpa.gnu.org/packages/debbugs-0.12.tar"; + sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -833,6 +833,20 @@ license = lib.licenses.free; }; }) {}; + highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "highlight-escape-sequences"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el"; + sha256 = "0q54h0zdaflr2sk4mwgm2ix8cdq4rm4pz03ln430qxc1zm8pz6gy"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html"; + license = lib.licenses.free; + }; + }) {}; html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "html5-schema"; version = "0.1"; @@ -1337,10 +1351,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161024"; + version = "20161031"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161024.tar"; - sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj"; + url = "https://elpa.gnu.org/packages/org-20161031.tar"; + sha256 = "0b4dzdimdkp7116cyyq80n4h71qc477akiblbabnpb8sg87qqg7r"; }; packageRequires = []; meta = { @@ -1388,6 +1402,20 @@ license = lib.licenses.free; }; }) {}; + parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "parsec"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar"; + sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/parsec.html"; + license = lib.licenses.free; + }; + }) {}; pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "pinentry"; version = "0.1"; @@ -1569,10 +1597,10 @@ }) {}; seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "seq"; - version = "2.16"; + version = "2.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.16.tar"; - sha256 = "1fc1cjbb3lrxgkhzvg4bkpxr408hhg8kqa07n0jfalrdzaa3bika"; + url = "https://elpa.gnu.org/packages/seq-2.19.tar"; + sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha"; }; packageRequires = []; meta = { @@ -1981,10 +2009,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar"; - sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak"; + url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar"; + sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2048,10 +2076,10 @@ yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.10.0.tar"; - sha256 = "0vh70i73rknaxzglr4nragassgpjy2lj5mca2x6wqiqmv7mc8xdv"; + url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar"; + sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y"; }; packageRequires = [ cl-lib ]; meta = { From b4f7993618c365d2868e7326bd8bab15b15e1604 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 31 Oct 2016 20:08:14 -0400 Subject: [PATCH 036/336] org-packages: 2016-10-31 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 822f9e5f1bd..642b3ebdb5f 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161024"; + version = "20161031"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161024.tar"; - sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h"; + url = "http://orgmode.org/elpa/org-20161031.tar"; + sha256 = "1nabn8kj50bxvm3b429j73xipq557kx5j4nr7s5bwxs85i89133q"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161024"; + version = "20161031"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar"; - sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161031.tar"; + sha256 = "1j0mwqmdyslvdfhd3x9c9li8s41wsaxk81qzfizdwxl9csdf9ki4"; }; packageRequires = []; meta = { From 3a8f4624d793bd454165fc7d74861bb91af66fb6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 31 Oct 2016 20:19:31 -0400 Subject: [PATCH 037/336] melpa-stable-packages: 2016-10-31 removed from melpa: - colorsarenice-theme - marmalade - stekene-theme --- .../emacs-modes/melpa-stable-generated.nix | 373 ++++++++++-------- 1 file changed, 211 insertions(+), 162 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index aa9547d4b7b..6c1f92a69ef 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1624,6 +1624,27 @@ license = lib.licenses.free; }; }) {}; + atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: + melpaBuild { + pname = "atomic-chrome"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "alpha22jp"; + repo = "atomic-chrome"; + rev = "6fe75d409323554d4c4f35ac0e90963fe90d3a43"; + sha256 = "0lc0j6ffd6cpqnpfvpqm7rfxblj34pg9vw3zs1hkg15g7qw0nh5c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; + sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; + name = "atomic-chrome"; + }; + packageRequires = [ emacs let-alist websocket ]; + meta = { + homepage = "https://melpa.org/#/atomic-chrome"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -3082,12 +3103,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24"; - sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr"; + rev = "58f641960bcb152b33fcd27d41111291702e2da6"; + sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -3205,6 +3226,27 @@ license = lib.licenses.free; }; }) {}; + cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "cdnjs"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "yasuyk"; + repo = "cdnjs.el"; + rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; + sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; + sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; + name = "cdnjs"; + }; + packageRequires = [ dash deferred f pkg-info ]; + meta = { + homepage = "https://melpa.org/#/cdnjs"; + license = lib.licenses.free; + }; + }) {}; celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "celery"; @@ -3376,12 +3418,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "0.5"; + version = "1.0"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "915f77912f0f8cfe064c6872cae5c0709e4e094e"; - sha256 = "004xnn6j4jc607h5qcl9jr0dqvhvqvgm77wrbdmdxpwd6hwp2sf4"; + rev = "43931dbb96c3aa5df8dda030503f1458dc6ca1c5"; + sha256 = "0kn3nsdlsgd6hlq7c32kp29bhh9zych727sbx028w1bidjsvjlly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -4077,27 +4119,6 @@ license = lib.licenses.free; }; }) {}; - colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "colorsarenice-theme"; - version = "1.0.20"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "colorsarenice-theme"; - rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"; - sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme"; - sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi"; - name = "colorsarenice-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/colorsarenice-theme"; - license = lib.licenses.free; - }; - }) {}; commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commander"; @@ -4716,12 +4737,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc"; - sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778"; + rev = "47d840e03412da5db13ae2b962576f0166517581"; + sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -5007,6 +5028,27 @@ license = lib.licenses.free; }; }) {}; + creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "creamsody-theme"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "emacsfodder"; + repo = "emacs-theme-creamsody"; + rev = "41164f285735383848aba1bfef4282bca4e9a8e8"; + sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; + sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; + name = "creamsody-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/creamsody-theme"; + license = lib.licenses.free; + }; + }) {}; creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "creds"; @@ -5239,12 +5281,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33"; - sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp"; + rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041"; + sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -5281,12 +5323,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "27d7795ce424cd710431c47ab4cb29111f1a3e9c"; - sha256 = "0kddvsnc4a2ass4zfzrqp26jlbnqsgbv0dy9rmj3p2n61wqkw4wk"; + rev = "278a567621d586af74a1c845de0a1426b686c72e"; + sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -5927,22 +5969,22 @@ license = lib.licenses.free; }; }) {}; - dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }: + dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "0.2"; + version = "0.3"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde"; - sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy"; + rev = "7fc95de6d7722b304124a890e4fb577e16897b1f"; + sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na"; name = "dired-icon"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/dired-icon"; license = lib.licenses.free; @@ -6265,12 +6307,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f"; - sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal"; + rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; + sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -6776,12 +6818,12 @@ easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill-extras"; - version = "0.9.4"; + version = "0.9.4.1"; src = fetchFromGitHub { owner = "knu"; repo = "easy-kill-extras.el"; - rev = "242844bc95b9015396405d84c4335338037968c3"; - sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0"; + rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; + sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; @@ -6860,12 +6902,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "2.7.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05"; - sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph"; + rev = "219665ba1c9aad885cee6e9914448139be7f7299"; + sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -7194,12 +7236,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; - sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; + rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; + sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -7467,12 +7509,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; - sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7488,12 +7530,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; - sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -7572,12 +7614,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.19.6"; + version = "0.19.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16"; - sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b"; + rev = "a842d54348846746ef249a87ac7961a9a787947f"; + sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -7698,12 +7740,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c9487a14e9cb21b531660de7e648086e270ab08f"; - sha256 = "1x4asq5zqv8wbp034gzcrza9y2nbbwx1nrwi4jnwak0x0yn3c2dj"; + rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; + sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -9418,12 +9460,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "981c80bb53384f93987d03c1b307767f2a68791a"; - sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5"; + rev = "54c618aada776bfda0742819ff9e91845a91e095"; + sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -9859,12 +9901,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "eb7dac9dba845cd73b57b9046761804969adec11"; - sha256 = "0ynd4mq2vckyczfblw3r92lcbn4518jh3mzv5r11drlra9sdjnl8"; + rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; + sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -10132,12 +10174,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "b69411d15902d9d1cbb0184885f726270de0b98c"; - sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp"; + rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6"; + sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -10790,12 +10832,12 @@ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "joedevivo"; repo = "flycheck-rebar3"; - rev = "534df87b0c2197fa15057f1e1a19763411c59220"; - sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3"; + rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; + sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; @@ -11690,22 +11732,30 @@ license = lib.licenses.free; }; }) {}; - fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }: + fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.8.1"; + version = "1.9.3"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "51bad86059528f1ce87ef12e1657531aa11a386d"; - sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr"; + rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; + sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z"; name = "fsharp-mode"; }; - packageRequires = [ company company-quickhelp dash popup pos-tip s ]; + packageRequires = [ + company + company-quickhelp + dash + flycheck + popup + pos-tip + s + ]; meta = { homepage = "https://melpa.org/#/fsharp-mode"; license = lib.licenses.free; @@ -13056,12 +13106,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "0.0.5"; + version = "0.0.7"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "de7f838af320c87f10cba17619492e072000c47e"; - sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z"; + rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede"; + sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -13245,12 +13295,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "bb498f73762deb009468da8c3bd93b7c6002a63e"; - sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg"; + rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; + sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -16568,6 +16618,27 @@ license = lib.licenses.free; }; }) {}; + import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "import-js"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "galooshi"; + repo = "emacs-import-js"; + rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; + sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; + sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; + name = "import-js"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/import-js"; + license = lib.licenses.free; + }; + }) {}; import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; @@ -16885,12 +16956,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5378bb637c76c48eca64ccda0c855f7557aecb60"; - sha256 = "1vgmbs790l8z90bk8sib3xvli06p1nkrjnnvlnhsjzkkpxynf2nf"; + rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; + sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -17492,12 +17563,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34"; - sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly"; + rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38"; + sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -19540,27 +19611,6 @@ license = lib.licenses.free; }; }) {}; - marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { - pname = "marmalade"; - version = "0.0.4"; - src = fetchFromGitHub { - owner = "nex3"; - repo = "marmalade"; - rev = "01d6ddf5f0e822d6df393aa4546b069b2d6545d7"; - sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade"; - sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s"; - name = "marmalade"; - }; - packageRequires = [ furl ]; - meta = { - homepage = "https://melpa.org/#/marmalade"; - license = lib.licenses.free; - }; - }) {}; marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; @@ -23364,12 +23414,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; - sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; + rev = "f0fd4fe8b6cd368cab077177c3eb8be092856b49"; + sha256 = "069crk0xdm061m4jipkgwh1n4845cpa9j7dvg8ngqzrd4j2f243x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -23572,12 +23622,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218"; - sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc"; + rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3"; + sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -25982,12 +26032,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "b59764e181990ddd3ab441cdc290b5fe178860f4"; - sha256 = "1x5r6cb430hfbdqq3samlfkaawy49i1gi6mzai2061r780h7w4fx"; + rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967"; + sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -26882,6 +26932,26 @@ license = lib.licenses.free; }; }) {}; + schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "schrute"; + version = "0.2"; + src = fetchgit { + url = "https://bitbucket.org/shackra/dwight-k.-schrute"; + rev = "99857394886e516d5ebd63fedff200bceaef1d4d"; + sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; + sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; + name = "schrute"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/schrute"; + license = lib.licenses.free; + }; + }) {}; scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; @@ -28666,27 +28736,6 @@ license = lib.licenses.free; }; }) {}; - stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "stekene-theme"; - version = "1.0.15"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "stekene-theme"; - rev = "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673"; - sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme"; - sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1"; - name = "stekene-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/stekene-theme"; - license = lib.licenses.free; - }; - }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; version = "0.17.1"; @@ -31148,12 +31197,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "eb0b23e0de8bcf21c61c1edacd9fe89b2e6888d0"; - sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw"; + rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; + sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -31462,12 +31511,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.1.15"; + version = "1.2.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1eace34a1f5b780a30797976d0cfec5936048b7b"; - sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843"; + rev = "fc7482e4a2063697738a405686ebc62d87697ab8"; + sha256 = "1a52pc4iwr2mmby6h16vl436cm0psxnfgd3lhkqbq86sw3p78bx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -31717,8 +31766,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "b9e861ccb52d"; - sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2"; + rev = "9f38303df3b7"; + sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -31986,12 +32035,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "7a2f43908985590ab8b904004cd4c41e341216be"; - sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc"; + rev = "208810ea93214491e6e2329cdbf81de85437939a"; + sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -32280,12 +32329,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11"; - sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148"; + rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; + sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -32301,12 +32350,12 @@ yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6"; - sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8"; + rev = "90c14d2e2b8247eeba464a52560af484f8542558"; + sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; From aa1572e741ceacc6dec01217ec7ecf96542f458b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 31 Oct 2016 20:11:52 -0400 Subject: [PATCH 038/336] melpa-packages: 2016-10-31 renamed: - cssfmt -> stylefmt - git-blame -> git-blamed removed from melpa: - colorsarenice-theme - marmalade - org-pandoc - stekene-theme repository unavailable: - matrix-client --- .../editors/emacs-modes/melpa-generated.nix | 1526 +++++++++-------- 1 file changed, 805 insertions(+), 721 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 4f41eb9675d..b074e657309 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -20,22 +20,22 @@ license = lib.licenses.free; }; }) {}; - _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "_0xc"; - version = "20161018.1031"; + version = "20161027.2140"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "0xc"; - rev = "14891d76f031ce64969004644329d7f56821aabe"; - sha256 = "189khq7q90bdphkfx5hdj3bci7lkhcvr6yng4bbr6nj8l4qj2c5s"; + rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401"; + sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w"; name = "_0xc"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/0xc"; license = lib.licenses.free; @@ -1257,12 +1257,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20161021.2133"; + version = "20161027.1758"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "53dde62ab6889b0beeb3012c2bdeefd85c126140"; - sha256 = "0m43x263d9ksmxc34hqxngxhhwi7n2blb6n11vbckx2v91si2fjs"; + rev = "2427786228f13f5893a8513d4837d14d1a1b375f"; + sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1381,12 +1381,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20161003.811"; + version = "20161024.1051"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "563638c5b4102805e5b3282abfb2278921c07898"; - sha256 = "10c3cgjz9q5di3cpnvx970l36akf1i0w7sxas0ppk7gpy22cg2wl"; + rev = "11e69a143ed66e50f0c95fda93ba0a5fa8bdf583"; + sha256 = "1n9qf9xmqbm0mjgcbzxgnmy1020rbh1cd7jmjbbfd8xhlh0kw14z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1663,12 +1663,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20161009.1046"; + version = "20161028.29"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "3f473150009f86dac68edb02e2f22850788289a5"; - sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7"; + rev = "ae336344e61c1d38480ec230d85efbe2cb17980f"; + sha256 = "1776s0gf9283amskmaqnpcpflqgvzk87n5qcishiczxijdymry7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2572,12 +2572,12 @@ artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; - version = "20160603.1720"; + version = "20161030.2059"; src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; - rev = "f4d36cf9b506cd27e0615ba8dfed59c35885cd18"; - sha256 = "063j7q2i3701fmh44m77d572ppq0fd60hznh8jcwqa1ljbzynzkn"; + rev = "d77a01985a9161ce1676fb18d7228a0df566942b"; + sha256 = "1y69zq4r9ir1a2hy03lillxhw3skfj8ckkjv45i5xpasz4hjw50j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; @@ -2776,6 +2776,27 @@ license = lib.licenses.free; }; }) {}; + atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: + melpaBuild { + pname = "atomic-chrome"; + version = "20161030.629"; + src = fetchFromGitHub { + owner = "alpha22jp"; + repo = "atomic-chrome"; + rev = "f9a7d4c5d6bdcb0d689d41b6b9c604997b7971ab"; + sha256 = "1v6d9l7db85ql01grx7nyz4516q41rqwyzb85xk2zx6zhx3d99ns"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; + sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; + name = "atomic-chrome"; + }; + packageRequires = [ emacs let-alist websocket ]; + meta = { + homepage = "https://melpa.org/#/atomic-chrome"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -2986,12 +3007,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20160827.649"; + version = "20161029.643"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "b0090a942f93824bcbe9a938217c665ea658eacd"; - sha256 = "1c6gmk9j5rhjqdsgns3v0f91vy3x6zs715p68m3sh7vn7cwsdw63"; + rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae"; + sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3693,12 +3714,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20160909.1323"; + version = "20161029.504"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260"; - sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz"; + rev = "d8c91d67c78d90d04f2cda01ded019c6931250d6"; + sha256 = "1lyxx55yd1fd52r588j9g0vrx6nl5nl8msc5si8qfh7naprr4hh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; @@ -4490,8 +4511,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "c5bfdc3bb77a8c019aa4433cf12d3c45690c27bd"; - sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p"; + rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197"; + sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4781,8 +4802,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6"; - sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk"; + rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; + sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4802,8 +4823,8 @@ src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; - rev = "078c522f6e763dd24a30e15af9121376affe207f"; - sha256 = "16yk8xl6ds6zp0ndfzr613k8wkzl7hnsqnmnn1bi1da5laxbwrdb"; + rev = "6e1ba6edbd5a29991698806e775288fb3de2b186"; + sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; @@ -5072,8 +5093,8 @@ src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42"; - sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw"; + rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45"; + sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5110,12 +5131,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20160725.1801"; + version = "20161024.1828"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "fc71c376546ed01060200de91d007f2a179bc601"; - sha256 = "13z0zpy9ggam0v16kzqn5gncvmil3magrvrvhm304gvsqqglyiqi"; + rev = "a6b566a4eca0dcc89a7d2af42e057b4e2561189d"; + sha256 = "1y3i9wcvxj1s7hyxb3ni0p7hmdlln1h3a1h2ddgkjw5yv2vq768q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5193,7 +5214,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160921.1035"; + version = "20161027.926"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5209,15 +5230,36 @@ license = lib.licenses.free; }; }) {}; + bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bool-flip"; + version = "20161030.1654"; + src = fetchFromGitHub { + owner = "michaeljb"; + repo = "bool-flip"; + rev = "04354f6412bd096cce59138e2113eb1db3dcba63"; + sha256 = "1pdylz85sarhaakh8hdvn5mjhh4j3y6yy5sn4cjvqz9xan4g3yyl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; + sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c"; + name = "bool-flip"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bool-flip"; + license = lib.licenses.free; + }; + }) {}; boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161013.2331"; + version = "20161031.1257"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bd3f79f3f1c1aaef942ee5d2ef053534bd3adbff"; - sha256 = "0jrrfrs277spd1h3gha9fp3jbyafj4cxzg7gdzxj9px04iyyn4zs"; + rev = "6012b4b98c1934e567f74b48b27fd67f46ad2208"; + sha256 = "0xyqjfmi0jnhbb8jwr6q0ynkr20vbi1npxc94kf7ddn2cgxvp0j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6378,12 +6420,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20161003.1152"; + version = "20161024.1205"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "8712ea35172e8c63320f963a982c1b50fc7578d1"; - sha256 = "0709zak2y1ifwl9p6qqnzz9vpblan4n7zyrlx81jrkxd3x697dkq"; + rev = "58f641960bcb152b33fcd27d41111291702e2da6"; + sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6564,22 +6606,22 @@ license = lib.licenses.free; }; }) {}; - cdnjs = callPackage ({ cl-lib ? null, dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "cdnjs"; - version = "20140217.1312"; + version = "20161031.822"; src = fetchFromGitHub { owner = "yasuyk"; repo = "cdnjs.el"; - rev = "eac2b4d150907aeb2d568327d04775578c82887f"; - sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk"; + rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; + sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; name = "cdnjs"; }; - packageRequires = [ cl-lib dash deferred f pkg-info ]; + packageRequires = [ dash deferred f pkg-info ]; meta = { homepage = "https://melpa.org/#/cdnjs"; license = lib.licenses.free; @@ -6716,8 +6758,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "67075d95e0eef274d7d423dac80665d5b938277b"; - sha256 = "1jrr49ckph5h2z3q1xpmbj10v7h95vaw5pidxh46l344gzbczniz"; + rev = "3726a19cb9b33abf3ae7b760902637ed40051836"; + sha256 = "05mfldh44j07wslbz3hq874amfld42vwkg70f0966rmlh1nz3rwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6756,7 +6798,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11826"; + rev = "11866"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -7107,12 +7149,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160923.2342"; + version = "20161031.414"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "3d0ccf663fd6b3753a886239dd64fbef44bc02fd"; - sha256 = "0ggz80wlq86scdvfpg4fg9hvwgis9qwsfs52dyk2gpwfpqyn7pmc"; + rev = "4e5267fab7765661075c0e79122ec358cfb7feb5"; + sha256 = "0lhs6skd6jvgs9hk1f564mc94cd2fxn56dhnpdwqijrg9a4c06m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7167,6 +7209,27 @@ license = lib.licenses.free; }; }) {}; + chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chinese-pyim-wbdict"; + version = "20161029.2308"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "chinese-pyim-wbdict"; + rev = "7a755a1808526bd777b1fd5049b3891fd9a5ec0c"; + sha256 = "04c87l9y53xq21najw37wywilaxpk1kki8y2pisjyd36rvr7ad1y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict"; + sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c"; + name = "chinese-pyim-wbdict"; + }; + packageRequires = [ chinese-pyim ]; + meta = { + homepage = "https://melpa.org/#/chinese-pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-remote-input"; @@ -7233,12 +7296,12 @@ chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-yasdcv"; - version = "20150702.616"; + version = "20161030.1504"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; - rev = "619e4d701ed995ad2c95f35072c638cfb3933afb"; - sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq"; + rev = "664494d4c4562a4d83a0e73386f854829d7a52c0"; + sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; @@ -7590,8 +7653,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "284990"; - sha256 = "15d5ils5nlqydqmvjjm5znnbj9r489n9018qym8zl58m2dw0i753"; + rev = "285627"; + sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7754,12 +7817,12 @@ clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "clippy"; - version = "20140417.414"; + version = "20161028.1254"; src = fetchFromGitHub { owner = "Fuco1"; repo = "clippy.el"; - rev = "23ba8772056a103267611b3757722730740d9f00"; - sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc"; + rev = "ad4b5dba4cede6d4b21533186303d3d3e9a2510f"; + sha256 = "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3743596c4b6387351684b1bf00f17275b8e59e8/recipes/clippy"; @@ -8081,12 +8144,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20160902.1242"; + version = "20161025.947"; src = fetchFromGitLab { owner = "tarsius"; repo = "closql"; - rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; - sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; + rev = "c230818f23f0663c5775c4ec05136b8ff5862367"; + sha256 = "0qnxfzancvpn36fq4q0v7fj0p5ra1qm1rkh5yw4ldiz6bj7h6r67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; @@ -8232,8 +8295,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "f660832999e086f02a9f3552c028aed900cd7249"; - sha256 = "02v72yi1b3crq549959wi0a4rxjwknzkx6wqalraz7r2p5vfwdwy"; + rev = "098a18c476b5e60b3bacc0e47f23359fc4a3ea2c"; + sha256 = "0aqza32r1rwhhrzckprcs7gch55l952007h2n7pf2jx0napk9rid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8663,12 +8726,12 @@ color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-modern"; - version = "20160411.1846"; + version = "20161029.720"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "replace-colorthemes"; - rev = "7107540d22e8ff045e0707de84c8b179fd829302"; - sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9"; + rev = "c76b6e8e702457fc2e8907b367efdafd3b7123d9"; + sha256 = "0ffvjilk59mbq8mn069hr9q0a0w3yqy6v3r3q94ca22bsv0gwcmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern"; @@ -8765,27 +8828,6 @@ license = lib.licenses.free; }; }) {}; - colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "colorsarenice-theme"; - version = "20150421.1336"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "colorsarenice-theme"; - rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"; - sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme"; - sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi"; - name = "colorsarenice-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/colorsarenice-theme"; - license = lib.licenses.free; - }; - }) {}; column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; @@ -9067,12 +9109,12 @@ company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-auctex"; - version = "20151102.643"; + version = "20161025.24"; src = fetchFromGitHub { owner = "alexeyr"; repo = "company-auctex"; - rev = "780ba68b4154ecac4f20dbd4b1ba561ba40f248b"; - sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5"; + rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3"; + sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex"; @@ -9857,12 +9899,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160918.1527"; + version = "20161026.2337"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "140079b822452b141ce022bbf082deae17edd6d3"; + sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9899,12 +9941,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "20160903.1100"; + version = "20161029.1317"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "5437ce0417e79ab4aad54f25bc756041eda4dece"; - sha256 = "02x1hs3mv7llidkig15m88nb3zp20smy6b80p7c71vbzapp1mz52"; + rev = "47d840e03412da5db13ae2b962576f0166517581"; + sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -9924,8 +9966,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; - sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; + rev = "9b46dedcb89923de417f7557743c4c22421f5787"; + sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -10192,12 +10234,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161020.2248"; + version = "20161030.48"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; + sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10441,6 +10483,27 @@ license = lib.licenses.free; }; }) {}; + creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "creamsody-theme"; + version = "20161024.2339"; + src = fetchFromGitHub { + owner = "emacsfodder"; + repo = "emacs-theme-creamsody"; + rev = "bc8ef72dd2b974354bdb108d73fd5468304d1b51"; + sha256 = "0p7f47n10ckd8iqa9r2gps5yf235v88ssla177fn370j0lnhhayi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; + sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; + name = "creamsody-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/creamsody-theme"; + license = lib.licenses.free; + }; + }) {}; creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "creds"; @@ -10712,27 +10775,6 @@ license = lib.licenses.free; }; }) {}; - cssfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cssfmt"; - version = "20150818.2128"; - src = fetchFromGitHub { - owner = "KeenS"; - repo = "cssfmt.el"; - rev = "802c82a1aa8d433ec473e253ae1fa4ecad3fb4b0"; - sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d95ca68c481061f5dc2614ae660a98d53837c46/recipes/cssfmt"; - sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8"; - name = "cssfmt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cssfmt"; - license = lib.licenses.free; - }; - }) {}; cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cssh"; @@ -11167,8 +11209,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d8c5467133aa16c3eccb19427c41a62a51115837"; - sha256 = "1afanvmf4w1ic2gr8nzrh47f5gbp83bbhrzgfpwfk4ci3487y47l"; + rev = "ccfebe9171fe65484d459aa3f0f3c1c97397c103"; + sha256 = "1ji1hra4iahy12067qzda0kbw5ry9khp6z0gbfrihzjq5rmn4h3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11268,12 +11310,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161024.227"; + version = "20161026.201"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "203e731f0415789fd1e15f795f245ab19ebd8cc7"; - sha256 = "1j88rqh2rqhmas72wz8y2j6izgq23q53x33wz33bfjprrs14dyv2"; + rev = "a667ef6967008ae6176838efd26b3631ba63a3df"; + sha256 = "1qrvss2qw88xqv040bp143h7aab78j1kp9x5j4s6pz0ihj593ywn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11457,12 +11499,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20160212.1121"; + version = "20161026.1510"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "05fbd30fb4dd1ce931fb15a3e88b13eeec5526ef"; - sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid"; + rev = "1f65c88dbc55dfc6c7d5322e693d6d30962b27ea"; + sha256 = "1ki5a104r302cxbmqj8h9ddbrp46la7yz3bxj1kxv8sl9afgbqcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -11881,8 +11923,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; - sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; + rev = "9b46dedcb89923de417f7557743c4c22421f5787"; + sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; @@ -12001,12 +12043,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161021.1305"; + version = "20161029.1731"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "43b1ee8180d0e0eeb91998eb81dbae11eac23bff"; - sha256 = "1amgjanl0dmsfv3w2kvggiq5yhwb3qvp7lfhgl29xg8gjdgy60z1"; + rev = "bc5d373bf22bb2458d5a5f9a9cf1917ab34b32f8"; + sha256 = "1kj8pr42cijk6xzj94hrkbplbark4dqrb0hcy7929ps80zbjqkn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12297,8 +12339,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "110624657fec0c8a7b3589108230e6a635302ae0"; - sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i"; + rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445"; + sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; @@ -12624,12 +12666,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "20161023.19"; + version = "20161030.1510"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "ffcd62cb997efadbbc1da62e1cffe957a21a22c8"; - sha256 = "0say1v2xlqhdvkbfcm7yfmqad2lq9c7m6ldplsxcw921yfadf4qx"; + rev = "6869d1aee10317f2d4fc49d343d642d422b7117b"; + sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -12768,12 +12810,12 @@ dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; - version = "20160524.338"; + version = "20161025.1322"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-quick-sort"; - rev = "f819be0bc67d8e8593fbbf71f1117b3e4fa33c27"; - sha256 = "12xcck2hypw13r522naghmfjpykld11ahyz9rqfz6qh8dnv2j234"; + rev = "192a2535025d4644729b65f38474eaf54c999f18"; + sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -13678,12 +13720,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161018.2349"; + version = "20161031.249"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "6fcc5082b4cb4b40e75c36d2569511139ee9de72"; - sha256 = "16hw7qbbln3rcd6n052wqwyyw5mpd4h4fsg4c2pz8vwixk5jhnmj"; + rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; + sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -13946,12 +13988,12 @@ dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; - version = "20161005.1443"; + version = "20161025.1037"; src = fetchFromGitHub { owner = "wyrickre"; repo = "dot-mode"; - rev = "783ccf5b1de591e9926c0b7133ad64a26db62315"; - sha256 = "1zsbr6cyyynczik7wdd7p6ii5nw7zn44ir7lvm2kkslwjswx34qc"; + rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc"; + sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode"; @@ -14260,7 +14302,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1766432"; + rev = "1767359"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14780,12 +14822,12 @@ easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill-extras"; - version = "20160418.1919"; + version = "20161028.504"; src = fetchFromGitHub { owner = "knu"; repo = "easy-kill-extras.el"; - rev = "65fc4fdfb79c6dd679b4a1a57fa657b4b39919cc"; - sha256 = "0mmhqid0x56m0p3b18a757147fy8km3p4kmi0y94kjq04a4ysg3k"; + rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; + sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; @@ -14885,12 +14927,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20161016.1143"; + version = "20161029.1119"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "007c001d8a200ed27c0bf6f32e09f6ed38a1fb37"; - sha256 = "1374r0j8i5zmxdnd23h7svpbcwghb2wskn0fgpvnk06859xjhpgl"; + rev = "cbe1e6dad9fe5a1fbe48e2f74d734c82d920be88"; + sha256 = "0w58jfj4mnhniq6n78y1yffs0md2xnrs8d1iqn34vagnp9zlr589"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15483,8 +15525,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "1d18f9f62fe85cf18b5ab522069d83d4733e85c2"; - sha256 = "0znr8i6p5ik8dh3abwycgfdm0byz0ywnj4fwh98smwb1ad3jdv37"; + rev = "1d5b34e4813000b61255f56af15d005a5947ef92"; + sha256 = "19jdix3r1pl2p6v9jrhgpf3h0fdl74js8xrj83c4lffhi3ry5w3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15500,12 +15542,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20161017.2111"; + version = "20161024.2138"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "758820bfd9a6bb3c95d559074e508a19308868d8"; - sha256 = "1npy4471xy9f2ww1851nqfpskxw0g3i7ls1ca1zzmjc7iqsm5irf"; + rev = "4b97a2e213a960cf6902ad00879262c1b274e122"; + sha256 = "04y0c385w7m60wsknaxc00wb07hkdnlvncr7qgsh5hwh61ggfh6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15561,12 +15603,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161021.1010"; + version = "20161030.1637"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "701ddbe39cd11d751601fd7830dd8f26e2dfebeb"; - sha256 = "0g627j293hykhzxzb9q3ab2xy4ycdkfh905wyyc4fvxci0672zkv"; + rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; + sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15670,8 +15712,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "0eafb42926eb4698cef52878c34ae6d1a6246b23"; - sha256 = "0fry19m2012gpsllilp02pyzcq29y4r28rq5pik4rv2znn9zvp9j"; + rev = "2e03d2d12af7b38c92a89ab6f61dd69f163fbd90"; + sha256 = "1csxihkh874p8jm0ndhwl1pnk3k5jdazxba439rzd8ni0rppsi4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16080,12 +16122,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161021.1247"; + version = "20161030.1731"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d54bc55af47591e87e3af9d72b91108c55629719"; - sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16150,12 +16192,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20160904.1131"; + version = "20161030.1731"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d54bc55af47591e87e3af9d72b91108c55629719"; - sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16171,12 +16213,12 @@ elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }: melpaBuild { pname = "elhome"; - version = "20131202.1108"; + version = "20161025.1342"; src = fetchFromGitHub { owner = "demyanrogozhin"; repo = "elhome"; - rev = "af112592fbc41a625d1d17828db78357df23c127"; - sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h"; + rev = "e789e806469af3e9705f72298683c21f6c3a516d"; + sha256 = "1q9glli1czbfp62aalblaak55j8rj2nl8bm8nifnnb8jrzj1qrn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/527cc08a3424f87fe2e99119b931530840ad07ba/recipes/elhome"; @@ -16255,12 +16297,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161001.1123"; + version = "20161027.2208"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "f4c04cbf533bbea93ac2fb6b6a41ba50c4dd2456"; - sha256 = "07x2hkhjm7nazi10h5sfkvcnpzyg86q383qyqclp78f5n6l4axif"; + rev = "f710313f4be05ff475c16ffda77f01026512ad34"; + sha256 = "0vdlcc4mfpda5pxwwfdqwnq3jhgv9mgj6739gnb00i192jg4605g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16360,12 +16402,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161006.11"; + version = "20161031.51"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16"; - sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b"; + rev = "a842d54348846746ef249a87ac7961a9a787947f"; + sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -16591,12 +16633,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161008.910"; + version = "20161028.215"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "22bfc60a8017e7cab18b442818210263ffc6d24a"; - sha256 = "1q7wbjz3y3xd31fprf9dpv6ifjijw31kwsgayg7dl0bxkhqigrfn"; + rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; + sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -16849,12 +16891,12 @@ emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsc"; - version = "20150807.257"; + version = "20161028.1006"; src = fetchFromGitHub { owner = "knu"; repo = "emacsc"; - rev = "02325c640232ee184314eb58d0051f365f7f085c"; - sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7"; + rev = "421e0c567358769e32f670ae8e949d99abae0c28"; + sha256 = "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc"; @@ -17636,12 +17678,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161023.113"; + version = "20161031.246"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "525692bc3ca2b4edb1122fd9f0101eee768caf93"; - sha256 = "1813f8yzyfpgc9b36fsznqkbjm9wnb2zs5kmwdl3wwg674lwm2dh"; + rev = "8f3f3f1e46aaeaabd87748c8f89c2bd4bc420dd0"; + sha256 = "0z62lmajsf2f8027lncv8bz1hwpfl2x84l10gx0qs6pdj59x1c5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17749,12 +17791,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20160902.1246"; + version = "20161028.1231"; src = fetchFromGitLab { owner = "tarsius"; repo = "epkg"; - rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; - sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; + rev = "979cb9cd6143a3672b4b175073ec3a8cd22d3863"; + sha256 = "00xqqnvp13ipbw1ilx42pb670z2h8rlvdpwa9cirkmvv8c54wkji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; @@ -17791,12 +17833,12 @@ epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epm"; - version = "20160628.4"; + version = "20161027.34"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; - rev = "82e342af7be59aa94bb0fb0e2a29a98c65cf2ef7"; - sha256 = "06fyndwgkmylhan81rpnv8h729p70iqrmxgbmsdm5fjrdgzzs3a6"; + rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a"; + sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; @@ -17893,22 +17935,22 @@ license = lib.licenses.free; }; }) {}; - erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20160323.1839"; + version = "20161029.2101"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "e0c9951aae52b54d766c666214b25a64ede116a4"; - sha256 = "0yiv16k0b2399asghc7qv9c9pj6ih0rwc863dskr2isnpl39amra"; + rev = "2d7e5bec956f17203b916772a980c8115d6c70d1"; + sha256 = "0k77l8mj28c0z5d9wq07sblb4w1z0asy0vdxpl74n6r68sr66y57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3"; name = "erc-crypt"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/erc-crypt"; license = lib.licenses.free; @@ -18231,12 +18273,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161012.2127"; + version = "20161025.1222"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292"; - sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi"; + rev = "f12edbb42f512ebeabcfb0a56e89924c21ddc529"; + sha256 = "12zmq9bsfjiigp3fdnqa349dmc8n5mb2j1szlpmzj2f4i6vm9rk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18273,12 +18315,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161019.117"; + version = "20161024.359"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "055b1b09537b8900489d28ba37078edd7be57d04"; - sha256 = "05kj124sdrc29b1agcf1cps27kn023z6ii6smf6cds091nmqf897"; + rev = "056789659edec99e5500c4508f00460b98d6c73f"; + sha256 = "10p04f4r9qyqlwxlvjcfhblgjh565108bvxxqjqcv34651qdvikx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18374,12 +18416,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20160815.1309"; + version = "20161027.159"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "b4ebafe62d0593adec38a3845af6b5499df4ab39"; - sha256 = "0babcbyarqxfqka5dl91zz58wyz1j7xfc8wy0r9818lwj15nr422"; + rev = "10628b8b90294077174f78e7b75e548f2a4b6f78"; + sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -18651,8 +18693,8 @@ src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "380d7f66b2f7118be786289e9c8d87b5106803da"; - sha256 = "1ll0k99jblswp04hw2n9i7g91hypgpgxdh1cjfzd84pdwlc4avc5"; + rev = "1e6313bb62c573c0f07d3fc6dc910b7a48bc1b18"; + sha256 = "0ffs6iw0v2y2gggpr7hpzcclcdvfim98d3ln38bf1bnajfjg0fz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; @@ -18962,12 +19004,12 @@ etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }: melpaBuild { pname = "etable"; - version = "20150327.1016"; + version = "20161028.1309"; src = fetchFromGitHub { owner = "Fuco1"; repo = "ETable"; - rev = "8c9a32a92e7f808874c150c851f1605b2dd83d6e"; - sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy"; + rev = "d502141f0c69bf95256ba5cb9cd15350c7e942d2"; + sha256 = "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/etable"; @@ -19400,8 +19442,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3"; - sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn"; + rev = "9c40afed6603bf6367b58fa1ccf8aa6feb66eff3"; + sha256 = "05hshgfkp8lkmz5bky95ky53jdb869w3x3sv30lq7qc6b7qxrjfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; @@ -19711,12 +19753,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20160923.1622"; + version = "20161025.1223"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "540846d2769b7466f4d98accafdc4e0d1dc76ece"; - sha256 = "0j970h7xapg3y29rsyhirmda81d59ck5acjz0yrmjxjy0f61kq3w"; + rev = "bb6733d5ac08dad8754507c642f6a03f05f339eb"; + sha256 = "1xbkai747ql2kh6g80i35hgfbaqv9is98qxcw6g8zzvl8rrwkh4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -19795,12 +19837,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20160524.400"; + version = "20161031.409"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "8e126cda3d47f87f96d81b5abf76188d3b6316fe"; - sha256 = "05lv08gj0659j16jf8x1pif3b885vnj0qg3md7n827la9k94sfml"; + rev = "54c618aada776bfda0742819ff9e91845a91e095"; + sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20047,12 +20089,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20160911.1224"; + version = "20161029.606"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "3812140e11a1b30878701cc028a4305ec3280a35"; - sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj"; + rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2"; + sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -20530,12 +20572,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20160625.201"; + version = "20161027.1213"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "90b6b364bb372354deb32463a9a259ac9a16da7f"; - sha256 = "1fl26ix15bd8qgf8q9p68n92y6zmgkydrswhrwzxp8znnirkps3i"; + rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; + sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -20771,12 +20813,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20160928.741"; + version = "20161026.1047"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "cdac27efa1ed24c536b26df70476405e78c1de5e"; - sha256 = "1hwypmqn3q14kw9ayd89nfnk92m5k4anzi4d2sxi54sjxdl02lwn"; + rev = "61d98d43c9173662078c0c337ce78918eb6a3610"; + sha256 = "15shbzjpl89ybyyn7d53psn9i8csxi2h9jwz7mx98lg9pjy58ifa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -20838,8 +20880,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "fancy-battery.el"; - rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68"; - sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0"; + rev = "9b88ae77a01aa3edc529840338bcb2db7f445822"; + sha256 = "1k6prddw277iszh9hq145yqidwiiy9iqz656rpmqwn5hmr1vakhk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery"; @@ -21264,12 +21306,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160909.1355"; + version = "20161026.145"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d"; - sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p"; + rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc"; + sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -21807,12 +21849,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20160831.633"; + version = "20161029.1930"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "b0d16a821c720ec9b32cf41a545656d3c00478ab"; - sha256 = "06zgl3j12ljz0w8p4p9n64jws3wjjiaydaih6bhzasbn94qmh2qv"; + rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0"; + sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -21951,12 +21993,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161023.738"; + version = "20161030.316"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b6e3e2db7bd8347a93637f78cc8fe20c4a4b6008"; - sha256 = "03h3g2yb4lfhg2z6n3isgy7kf6g5q3ph6k0f07kq0vg3rg4486ra"; + rev = "f8c20f4f986ba79f1e6960d3bc59498e6fb5eff3"; + sha256 = "09ydncdd8jkh22mfdq3ykzrxrscf05ks5dp1x6frv5ybf4dz33ql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22161,12 +22203,12 @@ flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; - version = "20161002.242"; + version = "20161031.422"; src = fetchFromGitHub { owner = "Simplify"; repo = "flycheck-css-colorguard"; - rev = "d42f5e17d9991604da2200afd4af2e1cc48533f0"; - sha256 = "09p3dclx9pq0b4i005gjyg5qqlcls65f3qkkym1sny2jmd9nrg61"; + rev = "ae94fa0396acd99f9ec36d9572459df793f37fe8"; + sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard"; @@ -22812,12 +22854,12 @@ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; - version = "20161022.433"; + version = "20161030.615"; src = fetchFromGitHub { owner = "joedevivo"; repo = "flycheck-rebar3"; - rev = "534df87b0c2197fa15057f1e1a19763411c59220"; - sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3"; + rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; + sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; @@ -22942,8 +22984,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "140079b822452b141ce022bbf082deae17edd6d3"; + sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23610,12 +23652,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20161014.216"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -23631,12 +23673,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -23652,12 +23694,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -23673,12 +23715,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -24278,8 +24320,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "frame-restore.el"; - rev = "6346cf157d5e1b487a16839d998258b7e693cbc8"; - sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx"; + rev = "3fc6a84d1629f3c219bf3fd4309b2253fdcc99b5"; + sha256 = "11k3jmabf2i5ivb5gk19k2ij3svfzwlwxvrxaby1k0isp537fabr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; @@ -24439,12 +24481,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20160719.315"; + version = "20161031.959"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "3ab9f2ec3d0b70545f3834d26dbdadf760648f6d"; - sha256 = "06znv94bbx97j50226b5x2q7vnjb6j57ljmaygj0cvy8linr5j8n"; + rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; + sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24492,8 +24534,8 @@ version = "20161007.2213"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "417e296d46a80eeadcdbfcc06b017ccb3f86fbb9"; - sha256 = "00ghsi7yr540km7c2b4202pq17qak8g8gziqlx6l5nw64hjjkg6n"; + rev = "e9cd20604c557ced77c19393da43a4a0821c2e37"; + sha256 = "1np02migjmwj3l1jajjafw35vqhshkwizdx30kl474c5f5iibk1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25114,8 +25156,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "757e17f34ae7c9c167cb98a5b404c7854e7d57ee"; - sha256 = "0y61l3c4rnhydr84v18r42bg26wxs3rm4nfcj822z3s5hrsd34cd"; + rev = "a0ff7155e6a567db5a40a4f22c479b27cba25248"; + sha256 = "1sbx7sx4j9cvi5h004z2hhyaxp2qi1mlxwsfs8rmn5vw7djl40j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25359,24 +25401,24 @@ license = lib.licenses.free; }; }) {}; - git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-blamed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "git-blame"; - version = "20110509.926"; + pname = "git-blamed"; + version = "20161028.1226"; src = fetchFromGitHub { owner = "tsgates"; repo = "git-emacs"; - rev = "cfd3afe42b7d314c0cd1fc280dc35c69fc133869"; - sha256 = "125lh4gkxa0i66kvr0a6mrnc33knpqafjm3vg3278wy69pqrrznb"; + rev = "cef196abf398e2dd11f775d1e6cd8690567408aa"; + sha256 = "1n6x69z1s3hk6m6w8gpmqyrb2cxfzhi9w7q94d46c3z6r75v18vz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/git-blame"; - sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06"; - name = "git-blame"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/87bc01218964a01cfd471ee068ed75976793a568/recipes/git-blamed"; + sha256 = "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p"; + name = "git-blamed"; }; packageRequires = []; meta = { - homepage = "https://melpa.org/#/git-blame"; + homepage = "https://melpa.org/#/git-blamed"; license = lib.licenses.free; }; }) {}; @@ -25408,8 +25450,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; + sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25467,12 +25509,12 @@ git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20160903.852"; + version = "20161030.1851"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "338172b896bcc758a7e635cb5f79e19addf167e6"; - sha256 = "19a535y7k5s0kw12qrvxd74mb5ikszh0alsjivqpc8ydzvpqb9r7"; + rev = "0e33154a7d78bd7739fe081537dea49e309fbdd2"; + sha256 = "0q6cx0v2b96abxspx6czahvsccz3rsaqvphrhfv6gn6p1b95a8fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; @@ -26745,12 +26787,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "20161014.2042"; + version = "20161029.2346"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "d0755622a2600aece8c3319de0a1b8bc6d798ec3"; - sha256 = "1b7r3c5n3yp92gsphiyadp4ab9185vzfbbqqzgxq8rcxi3f4yjv2"; + rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a"; + sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -27145,8 +27187,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "bb498f73762deb009468da8c3bd93b7c6002a63e"; - sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg"; + rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; + sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27798,12 +27840,12 @@ gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; - version = "20160911.430"; + version = "20161030.646"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gulp-task-runner"; - rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; - sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; + rev = "72ac9e8b2e69d7348e10003f4b434b7b96856781"; + sha256 = "0iamindbxhqiq8w6rkjway35nv2df347bsfakszzk68ggl2i73xh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; @@ -27858,6 +27900,27 @@ license = lib.licenses.free; }; }) {}; + gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gxref"; + version = "20161031.451"; + src = fetchFromGitHub { + owner = "dedi"; + repo = "gxref"; + rev = "ddcd81ddcddd1715c8363848bf9d49553a91f148"; + sha256 = "1irg6jrk6wq6gzfbx79993qc82p9ilrs9gnz96hghrk2m8maizaj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; + sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; + name = "gxref"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gxref"; + license = lib.licenses.free; + }; + }) {}; habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; @@ -28218,12 +28281,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161020.2211"; + version = "20161027.139"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "7c763a3dd75b303da06917441c294516520dc3d1"; - sha256 = "03g79q9w08nbypjjs3zrlp85l99picyy101z0wbzz6gpxcwdqr15"; + rev = "cde6c60b0e511a7e22290542c4e8e5bb9b253cd0"; + sha256 = "0xpp1n8x9359139cndqpmggf18d6y2zlvwh96i0dqwqq3nniplxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28486,12 +28549,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161024.701"; + version = "20161029.1047"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced"; - sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m"; + rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; + sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28570,12 +28633,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161020.952"; + version = "20161025.809"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "5bb0effbfb526d545a0b5a243cc5ed386ce72029"; - sha256 = "1cagdwiy2h0nhsjfbkmhnaklfy0jfy40b0cfc17xd9ywr55g19ym"; + rev = "7a687f97e0ae7cb4cc4520aee9c97f84f2088ed9"; + sha256 = "01bl45i841h8n0ndjyj472m7w3pv0mnzmw8fy9ggbh8rcbhr61wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28675,12 +28738,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161018.807"; + version = "20161031.258"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0"; - sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx"; + rev = "46285116549fec9933fd035067773f5084937526"; + sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29032,12 +29095,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161024.13"; + version = "20161028.2141"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced"; - sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m"; + rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; + sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29809,12 +29872,12 @@ helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hoogle"; - version = "20160913.1022"; + version = "20161026.2234"; src = fetchFromGitHub { owner = "jwiegley"; repo = "helm-hoogle"; - rev = "882b729b9f0f23d35e808e0dcd51047954486135"; - sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d"; + rev = "73969a9d46d2121a849a01a9f7ed3636d01f7bbc"; + sha256 = "043bddm6lldl6wkifr1plqip7laai771z1a1l0x2h35l3g8c64h0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle"; @@ -30064,7 +30127,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "154226"; + rev = "154482"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -30564,12 +30627,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161020.554"; + version = "20161030.914"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "ae05bfa38f83e6b6c468b26ab4b02dfd29569108"; - sha256 = "1jjxfzvzqjg2illwn1ljv03cxjcfmkgsq3xvk7x9247xkv61xifk"; + rev = "07c268d162d11d8b4254a78a1bdaf881cdc560ee"; + sha256 = "1dzlawga65z0c49xzwpya09clcg013w7fm7mhqf70cniim5mcya8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -31537,12 +31600,12 @@ highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-escape-sequences"; - version = "20151231.412"; + version = "20161028.1617"; src = fetchFromGitHub { owner = "dgutov"; repo = "highlight-escape-sequences"; - rev = "ffb8c5da19ffd2a71003b93fe33f78d0900fad9e"; - sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az"; + rev = "c3f28f2003638e88e5cf0b03835412af7814f3b0"; + sha256 = "052r7bxdflgvygpvc5p63kkv11l9f7vfn16b1094af7xnniv8i3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences"; @@ -32154,12 +32217,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161024.921"; + version = "20161026.710"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "a26cf703567661488fe1bb8550f301d4db19da08"; - sha256 = "0vs26h7kwjawj7mbijz13p8fp84cypn6x3pjshvvl9mbd8v0yww4"; + rev = "589f0d36b9bb15665d84f0fc7bb401928d704449"; + sha256 = "0bid6y0nyikwzi1nqczds2p3p7glm7hiwj0mgqfminpyaldvgfi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32506,22 +32569,22 @@ license = lib.licenses.free; }; }) {}; - http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20160701.2025"; + version = "20161025.1120"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "5a85cb63ff8c25031c7a21f9ec7063a4ccfac547"; - sha256 = "18b8xf01n0mjshw7a4y1y3gzmag3lv9y64jyfb0dbx99xlxvvdv8"; + rev = "3b8cac5d30bf8142cdb9839292f39643be326f5b"; + sha256 = "0842l2wbk1f86lxzjsicqwxlmw639w26pr3dfk9rnymwzpm267kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm"; name = "http"; }; - packageRequires = [ emacs request ]; + packageRequires = [ edit-indirect emacs request ]; meta = { homepage = "https://melpa.org/#/http"; license = lib.licenses.free; @@ -33529,12 +33592,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20160927.1726"; + version = "20161030.1920"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "39919478f9472ce7a808ca601f4c19261ecc2f99"; - sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; + rev = "abcc27a9f07a7f855b0a8314f18640fd5cd7a0b6"; + sha256 = "152vxkwndv7ffggsnb1jhizf8p2fd5mbplwiln6ig2lzn21drdpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -33940,12 +34003,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20160504.2210"; + version = "20161026.1046"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "ce454d36fbbdd6cc9659eb0ef3c42560bdb6bfa5"; - sha256 = "1pv29qxiz9yqfp67fjj4mk8bqxs5y4qwcpx4kvznpfzdcwsza53j"; + rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; + sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; @@ -34003,12 +34066,12 @@ indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20130217.1405"; + version = "20161029.706"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; - rev = "c6d520eb3536cf3a77c635fa36fec031d3f84fe4"; - sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ"; + rev = "a9f228bab20285d599976d3acd506b38e03a0ff3"; + sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; @@ -34503,12 +34566,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161020.340"; + version = "20161027.207"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "e858b01160bd1ed844ceae54d785032907dea4a7"; - sha256 = "1laaqs85fhrrl860xv7s1fjiz2mm3a2xdwpd0b72h1991q19dhwf"; + rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; + sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -34835,10 +34898,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161022.1545"; + version = "20161030.1449"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "15a8gd2rsllk5avv6w0m1dkjv6aydsbbimywvj0i3mwjm6ika9lj"; + sha256 = "0jnch3c9zhil6k4dm4qgqf896vrmbfg7dlhqivlq6iij4a9mzjpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35061,12 +35124,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161021.2214"; + version = "20161030.27"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; + sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35082,12 +35145,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161018.807"; + version = "20161031.258"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0"; - sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx"; + rev = "46285116549fec9933fd035067773f5084937526"; + sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35149,8 +35212,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; + sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35353,12 +35416,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161014.103"; + version = "20161028.901"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "c9dfafc5e721db7cd11f02ca65fdf8ec3798f6e9"; - sha256 = "08xa0839df1pz8n2zk1zsr89lzrx0a5a2cjvq9gdmmgjqppry9hs"; + rev = "b944e8e88a209a15d3a7fc163de3345d9dd8fbf6"; + sha256 = "023j5majib0xb2xi8nk4grflfrwya8g1sxvrdp4qa3md5pwp9nfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -35693,8 +35756,8 @@ src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "12811feaa621bd06d29ebb0e0021d650e4c442d8"; - sha256 = "12m4iw9fjjr2kr1ffwhk98j1fs76zxrqhkbn4m9mg5cb96lmgmi9"; + rev = "788a75abd2df6bfce1073cdd2c39ccb58586360b"; + sha256 = "0iycwrcj4r9nncikl9hrqjg6snwwl7q2nv2x4fixzkkhs8f9gyah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee"; @@ -36043,12 +36106,12 @@ js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }: melpaBuild { pname = "js-auto-beautify"; - version = "20161021.1922"; + version = "20161030.2209"; src = fetchFromGitHub { owner = "Qquanwei"; repo = "auto-beautify.el"; - rev = "71f69c8ba65faf66c4752af322b45f56c3239ebd"; - sha256 = "1z2y4r1p3ar9h8irkyh7ifvpp1igjmdmag5wzqa828xhs1xhbq80"; + rev = "dd2e5940a07c5bb8e793f25e644def62c3426eed"; + sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify"; @@ -36106,12 +36169,12 @@ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; - version = "20161022.620"; + version = "20161027.2259"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "fdc6709469a95c848aa1619c11230827a9670206"; - sha256 = "1cldgsyy7jrm1splqk5fhg5x033ra8827wzv9z57734z6di1yk6a"; + rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9"; + sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; @@ -36169,12 +36232,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161016.156"; + version = "20161025.1012"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "91e722a798fc8c30cfa4fad119acc83892d41e9c"; - sha256 = "1pg9cdl8i10qlbsr756dsrsjvbp6fym04a97q54mfgjsv25kvrg7"; + rev = "94b27217cd8305029fdfdd2f4ef660622de8a582"; + sha256 = "0p8025p7n6frmdiycr5g8fg8hs2ygszpmx51c1xla2qjhn7wcf61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -36190,12 +36253,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161019.911"; + version = "20161025.649"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "1d15ffd95c0eecbb5ba3b5b5189ba87eb2126fdd"; - sha256 = "1nk1ap4cy6fqyy1c6prqnv0spcqy72vkjw2npnzffvg9afqcrlyh"; + rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38"; + sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -36299,8 +36362,8 @@ src = fetchFromGitHub { owner = "gongo"; repo = "json-reformat"; - rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4"; - sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y"; + rev = "8eb6668ed447988aea06467ba8f42e1f2178246f"; + sha256 = "11y11yybhb8wfj8qcj4gw8rhhly7kjs7ylyxwsh7qnfgq6f771qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat"; @@ -36461,12 +36524,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20161017.613"; + version = "20161027.625"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "483805b938a3fe543e075cbb60eefd4af805ad23"; - sha256 = "0diyvgm5y8iw0zsg4vjzv74kgzib0mspw4b4di06rg1gs7ivfl8r"; + rev = "feb6e79dddc8f992f85ae8c955ce024d57ec5e26"; + sha256 = "015y0y5xx7b3iky3r9gdnkh4kq1nxvdshvmlb0yy3mg71s62xi76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -37237,8 +37300,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "57dd0d91b7e5cf79da3d8e5c314c4fc083e418e9"; - sha256 = "11m239xgfpvfkjl3scbm1wf21ahp5fz1m7g10qjpa9ls7k1jni46"; + rev = "08ae6e1d290f40cd7649629436372ee6a52a7735"; + sha256 = "1bzbrwpnzwbym8y17m3298nnl7c3fcb1ib8689618jla0f74w6qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37880,12 +37943,12 @@ leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; - version = "20160905.1849"; + version = "20161029.756"; src = fetchFromGitHub { owner = "aborn"; repo = "leanote-emacs"; - rev = "7aa69b38d16985943c398bf10f3961cf59b54835"; - sha256 = "0iif540czjvikqk9dhdhrvkw372zdgsm882nzxpqiq81diw3chq2"; + rev = "f5f0ed732e8fb2316591e5152306e090774c4d49"; + sha256 = "0cj8nd63sjp8iysmxl1a1qqb5qpmmd95yp5g5b1g4ikak17mx2vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; @@ -37901,12 +37964,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161003.916"; + version = "20161030.1103"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "c46efbc497b51223c2276d1e23a9fcf1ea440634"; - sha256 = "1z9776k6swm3nvy81i3mnrsn472d8wd9p26gwy6zgidi7k9sj3k3"; + rev = "20901f226c0fc32dbd2a2836bdf6525389205313"; + sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38090,12 +38153,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161018.1057"; + version = "20161030.1205"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "05763cc1896c93ef0ed1df2f07e210137fad33d1"; - sha256 = "0z0lxcnmvw1vdfrf2rcsskyxj28x1m7m5732yfyjzdnwywwvrwm1"; + rev = "db7181c9ffce2e5f3244344440895df4e08bbcc1"; + sha256 = "1nka98zp1xmk94vv1vxd5ymkpprs0mgss4zxny87jax8drmlbjbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38154,8 +38217,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "8cf18f7a2172212e5cbd295bf9a573896596a70e"; - sha256 = "1mrqxlbhvzyz69axp4yvckms8lzrbqb9jyd539dv2dmml9mb7xbr"; + rev = "82636b12d82b0e3be076b69bfc31bb3507ba3530"; + sha256 = "0bjx08s95xklq6qszg1p3gl62c4y3kacwvz61ywgchhxvxdwi450"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38467,12 +38530,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161019.2038"; + version = "20161026.1538"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "a8c9c82c7354cc09ad98ea5a7475ec51a6a638c5"; - sha256 = "0sdhkw0krk1d4p2s3xzfyx84icm3k3ka1qv52c6fzj92pcv6rfap"; + rev = "fa1aaf0be0102ad5bedcea1154a62746f6457379"; + sha256 = "16hcy02jx4f3m6ps8m6sxks18a9mzagn262wcvf8vq3q1iargwai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -38867,8 +38930,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "05c107461ec2f9e25bb45e124186accc89f2c59f"; - sha256 = "1apsp79k5javfm8775yd8vy26xq6jlsh45nfwllpnk3zwlaiwa2v"; + rev = "7e057dcd4e19ef38ea59c2dc00fb13bda64c5ecf"; + sha256 = "0i8n2yiv3bw8jg5w2lzdhj9ycklkpwmvyxl4swcsslc8mp56368g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39486,12 +39549,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161024.155"; + version = "20161030.317"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; + sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -39665,8 +39728,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; + sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -39766,12 +39829,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161013.2332"; + version = "20161024.1527"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "78b1046f5c98e0286f1c48bd816eafd16e70d35c"; - sha256 = "0jwqs508aipxb05y9qljpfqkk2m69iavg716h93qn4lm6mvnl668"; + rev = "43bff16701daac38fb08c87bc60874bb4b1220f4"; + sha256 = "14r88xh3rwbr4kns487928pbh48mdwyg4qhr5wzj6yqb3kj0816j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40372,27 +40435,6 @@ license = lib.licenses.free; }; }) {}; - marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { - pname = "marmalade"; - version = "20110602.1622"; - src = fetchFromGitHub { - owner = "nex3"; - repo = "marmalade"; - rev = "2a4f07fbd4c17e08556c1a80c1753c37b3626d39"; - sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade"; - sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s"; - name = "marmalade"; - }; - packageRequires = [ furl ]; - meta = { - homepage = "https://melpa.org/#/marmalade"; - license = lib.licenses.free; - }; - }) {}; marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }: melpaBuild { pname = "marmalade-client"; @@ -40539,26 +40581,6 @@ license = lib.licenses.free; }; }) {}; - matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: - melpaBuild { - pname = "matrix-client"; - version = "20161004.1933"; - src = fetchgit { - url = "http://fort.kickass.systems/git/rrix/matrix-client.git"; - rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d"; - sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client"; - sha256 = "0znm8b1hd7iyb84qzxs25y850cbxxmydyzr7kx094rji55685c68"; - name = "matrix-client"; - }; - packageRequires = [ json request ]; - meta = { - homepage = "https://melpa.org/#/matrix-client"; - license = lib.licenses.free; - }; - }) {}; maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maude-mode"; @@ -41120,12 +41142,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161011.1859"; + version = "20161030.1807"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "eb3cb8f25f20a0a241f88ec48953cf49ff43a116"; - sha256 = "1bnkbd448apnh244napsv28zvfcqczgsc0ly3fjh1qc2kfihx978"; + rev = "15469053c8d7996b82270179d879d6e1e038282b"; + sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -42111,12 +42133,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20160808.654"; + version = "20161025.621"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "0b9b043f042145bf62969add7ec476ea51da7cbd"; - sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"; + rev = "fd742eee779c16f608d2369913ff067e1c47261f"; + sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -42294,12 +42316,12 @@ move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; - version = "20140925.808"; + version = "20161026.742"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "964d1bbaacd4559d2dbde9cb44015c400d5a71b5"; - sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8"; + rev = "612f5b3faa5bc36f7403b6fac7a1a524ae146f37"; + sha256 = "0xiwlqhhx9aqj4059srp04zw1nksf8crp1z1wcfn4516f8mxs66p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; @@ -43726,12 +43748,12 @@ nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nemerle"; - version = "20130328.746"; + version = "20161029.1323"; src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "97c18aca4d29d7f183437b2bfdfb8193cc47162a"; - sha256 = "0nspqnv5jk59r9l8mnca0d3fkyybhnrbm6jbghyv7z35xfh5n0bn"; + rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0"; + sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -43768,12 +43790,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161013.808"; + version = "20161028.2314"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "7ae38b71faf7878eac01cbb82c9819c903e5cd6d"; - sha256 = "0bzmv6ds74f1y4w81v59wikraqzjjsd2minzjk7xqp6iiv2i7rgh"; + rev = "991e1b8cb7cc3a0bbb9aa8fb109800b46b6cf3b2"; + sha256 = "0v4l4y4zwp93dgvlca23f6y9kgkzvv7i3cmvb6s5jki5syb86r3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44066,8 +44088,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f"; - sha256 = "0g420z3n0yspks0zy5ky529gbwriyrp702glslwq27ndl38aiiza"; + rev = "18b7363a699c0b5a4bf59d2b320dfc2b84dc4e67"; + sha256 = "11g99aw84w1as4can3184ns2znwg7knp8jnp7y3halm0bw1p1s63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44227,22 +44249,22 @@ license = lib.licenses.free; }; }) {}; - noctilux-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noctilux-theme"; - version = "20150723.747"; + version = "20161029.810"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "noctilux-theme"; - rev = "5f21c8523ddb99c4e5bc727d59ddf6bf6f50d626"; - sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs"; + rev = "8980a500eb2613771c873c78499a1f8a580fff9c"; + sha256 = "1qfwra5q6k3p5p2i35pzs3hcksvpg1f5nk4q4qrkqb8flypfasdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme"; sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp"; name = "noctilux-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/noctilux-theme"; license = lib.licenses.free; @@ -44332,11 +44354,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161022.847"; + version = "20161031.410"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "9be349c20faea4b119c69ec63a39476ec9570d85"; - sha256 = "1l2rmi6mc6iqvr2iizfai3apwf6qads9il05v8rmsh1s0278p8w4"; + rev = "429c30c2bc6587023f234a8a801f9ad5ce7076c0"; + sha256 = "1p8qv1y08yychsrmf3f3qjyiiisgjvd4h1slhn3zyk0bhif1xqvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -46158,12 +46180,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20161022.624"; + version = "20161025.1203"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "ebb5c949cb505248619e24534de9d9a19fa2979a"; - sha256 = "1clykj4ijm1pp3phhmm52w0vnz4ilhp8hb7gmfr0xvqd14cr9aq8"; + rev = "dfa1aa2f1b802819b8d6baaae4ee1a43f2fe925a"; + sha256 = "1whvqh76nqjmihgph2n0lasmvgb2zvd1pn98wyb3rw0h4hqyhlx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46641,12 +46663,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20161019.802"; + version = "20161029.222"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "d5c48f2f03b7aa85aa0ca850735ecb3539b21389"; - sha256 = "1wl5v5f60m6dm6ca8pv7k5myr6y3dn7s2w3rdaz9dqpprxxpqh62"; + rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc"; + sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -46895,8 +46917,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "359afa68060cee6a72707f53d69e1f9244cbc50c"; - sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50"; + rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; + sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -46915,8 +46937,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "359afa68060cee6a72707f53d69e1f9244cbc50c"; - sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50"; + rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; + sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47043,27 +47065,6 @@ license = lib.licenses.free; }; }) {}; - org-pandoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-pandoc"; - version = "20130729.1850"; - src = fetchFromGitHub { - owner = "robtillotson"; - repo = "org-pandoc"; - rev = "84b5df1f5516704540e19e048e18f437dc090a7d"; - sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2952138e5c4d0a075925ed2ee17daf941deaee2/recipes/org-pandoc"; - sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v"; - name = "org-pandoc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-pandoc"; - license = lib.licenses.free; - }; - }) {}; org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; @@ -47282,12 +47283,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161023.1844"; + version = "20161031.813"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "95a75c1a14ce347b801cc346ff39462fdfb785bb"; - sha256 = "11y8kfyfdzq6jx0mdnarac39jz8vk1b3bhbiiidaqqrjy31g427d"; + rev = "c295ff00ccc9e29a04c981cd2631d7428b5e5e63"; + sha256 = "1jbpnlli0g2kbsqrl3miwfjhfjf9zz9dlhbqd9fi891khyy5c6hm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47635,12 +47636,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20160904.122"; + version = "20161030.100"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "4c760fe11a6ca6b58e821753d648a6c8d3df4b85"; - sha256 = "00s7hzps7qr91i6hdkf96r253286d6j0gq5h69ia2jnp15827bgj"; + rev = "6a3c80ec00bb16707def17138e4230221511df3a"; + sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -48244,12 +48245,12 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20160416.846"; + version = "20161024.2158"; src = fetchFromGitHub { owner = "tj64"; repo = "outshine"; - rev = "61b2df38068ebd2fd12452485916eea2914daa3b"; - sha256 = "1smfdfw0swvfbqlxi7nkrgbmfqhs0x47ky6xhgf38la1s6ivh29n"; + rev = "d45a512d149996ca232c0218e2d6b5bc802285a9"; + sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; @@ -48374,8 +48375,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "bdb140750528d54200771e1d43a644a8c0692a5f"; - sha256 = "1cqvbk92cfr4p3i884vqi6hz1f67hkpcbvj71rx1z1x0vvs75505"; + rev = "8e7eb1ea80d2f11f7fc7e70e7418f79905dd00c3"; + sha256 = "1dbk37x5aaql03y97daqvw7nd70bym0cn93rad9m81djnhg46li3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -48395,8 +48396,8 @@ src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "8fa2c82e4c1d52381d4528fdd7acd234cc75e380"; - sha256 = "0hga00njg914wdpib7jc0xkw4pq40q1rcxqj6i9dsp4kl0h15wq1"; + rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73"; + sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -48475,16 +48476,16 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20160426.553"; + version = "20161026.429"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "c4b8fd30c3bc48621759c9d128644d2d386e591e"; - sha256 = "0csl9fcfwnpl6x3ld7xrlvgz6gwmgcd15a4zdc570w8vp26ra5k9"; + rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61"; + sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6905c43603bc3d64dfd04a5dbb25c9ac78e68631/recipes/ox-jira"; - sha256 = "0bm7i1ambd71xmy1y9jcdh52irgcsziwwb9d3y3rq0pnsqv5cpvp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; + sha256 = "088ks14d7slgs2qsqp1kkxvqzzhdkwphdvpg27ix686dz1krxxib"; name = "ox-jira"; }; packageRequires = [ org ]; @@ -48874,12 +48875,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161024.443"; + version = "20161027.1828"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "e821f61f2cff31de6532d10c72a2527c50f0d4be"; - sha256 = "15dygw0kd73n159axxhrwgr75cnvynk9gi99kljr09yr1pc11vpg"; + rev = "e7c411ecc54445a62300576f83e36ce552d592eb"; + sha256 = "00mvszyfyw08d16qy3nm125z71jd35j12vhrznvc2jcz17pgnnw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49102,12 +49103,12 @@ palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; - version = "20130731.821"; + version = "20161029.400"; src = fetchFromGitHub { owner = "danielsz"; repo = "Palimpsest"; - rev = "69fe61494bfd24305bf7e387fa716474918eafa2"; - sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq"; + rev = "7f5f43080155c53099f3174cb09684d77924d771"; + sha256 = "1z2acbmxsxfcw5d39zdzhg6l3r24m22nrfrp18j52d4i2jqawjfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest"; @@ -49165,12 +49166,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20160902.126"; + version = "20161027.1129"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; - sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; + rev = "2038ac386a20caec6f5a6477fec253f186c17715"; + sha256 = "00yr76pqcizxpi0p3a9r5j9fgfxf40srqgfpvdhbky63xmnq6ckx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -49331,12 +49332,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20161008.1400"; + version = "20161028.1127"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3"; - sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw"; + rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; + sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -49373,12 +49374,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161024.750"; + version = "20161025.845"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "42fee8539ee71471531814466b9a7ee20af523d4"; - sha256 = "0y26sg8qdvvhn1ya71abi58x99yl78pf78rkj3npa9vds3a718pj"; + rev = "b593725f5e6ac5c65866055df75b39d0b5fdc1fb"; + sha256 = "0d7ipf558141gf0qk82rvzfffmfa4vzn1yha0hza2fx8c0icv38l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -49436,12 +49437,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "20161021.1405"; + version = "20161027.1726"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "8c108be16dc07340d7681bebfba52649821e5d63"; - sha256 = "1h564hjhqyb5l39nmin6k4n50qh18rryy8giwhgnl6pkr1fw7fdl"; + rev = "21f5a117a054d1d21af51b0d92e7fa40b056a7e9"; + sha256 = "1fmsaf4fgg9nkwbrjafvfgsscgspggxbrbg32kpc2db5lcmi6h7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -49770,12 +49771,12 @@ pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcap-mode"; - version = "20161011.638"; + version = "20161025.748"; src = fetchFromGitHub { owner = "orgcandman"; repo = "pcap-mode"; - rev = "f681f074a335f40cf355171ecd05ebc8877642b0"; - sha256 = "10cj12bv2m9x1fmwi6s0awgsq9bqmrjnrgxmyp203c6yp9gbhv74"; + rev = "52780669af0ade136f84d73f21b4dbb7ab655416"; + sha256 = "1v218cjs0qy3ac0rbzm22y1x388nxnf0pslh9jrvlymkn227pjs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode"; @@ -49959,12 +49960,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161018.353"; + version = "20161026.1557"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "249cece6cf0746924715990283cefe1d9b1ae093"; - sha256 = "0l0p9s88b2bi3hdm7w5h3jbgrv8170yijq0d4h9lhijsymjzmg98"; + rev = "9696abb82e427670b8283599365a234ddaa170b4"; + sha256 = "0jmpvwar5hks2qbqkfabqw16zj9iyl99c79h6vm2z7jypsmzc8mp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -50210,12 +50211,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161024.704"; + version = "20161025.507"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "f6327c5052e1efa392353b6398cdc4b12c4fe17a"; - sha256 = "01902jlmin93j5wzhbl0dmzp836q7mrq4yvx01rggjbzd51pijw4"; + rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; + sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -50315,12 +50316,12 @@ ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; - version = "20130312.1137"; + version = "20161029.822"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "ph"; - rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe"; - sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p"; + rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f"; + sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph"; @@ -50966,12 +50967,12 @@ pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; - version = "20161017.2054"; + version = "20161028.618"; src = fetchFromGitHub { owner = "jxa"; repo = "pivotal-tracker"; - rev = "1d43a5908a21853d595cae79c58caadf2c7c0a07"; - sha256 = "19sf59f888pp8m11j9xbsrckw3750c7894nr4dcacwv90i0qwpw0"; + rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c"; + sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker"; @@ -51113,12 +51114,12 @@ planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "planet-theme"; - version = "20160821.717"; + version = "20161030.1917"; src = fetchFromGitHub { owner = "cmack"; repo = "emacs-planet-theme"; - rev = "4a3517728e009fb025d3f727eec4ea87b876aa2c"; - sha256 = "191cyq2q2ybrpqjb4hlqjlmpahdaxm1cpg1414x7xlnpj45chc1c"; + rev = "b0a310ff36565fe22224c407cf59569986698a32"; + sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme"; @@ -51341,8 +51342,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4"; - sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz"; + rev = "0d6986cf21b19174b6591399adc1dfb670828053"; + sha256 = "1xdjipwwhgvi38bw514hfd59r80dcg4jhm69ii4v06kkybfgz3wy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -52477,12 +52478,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20160923.708"; + version = "20161024.1043"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "c3a54723005d015d5d4364e4c74617dfd10ee294"; - sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0"; + rev = "168ab64262d5927520a838bb659ab38b4f001eee"; + sha256 = "1lkzl5svc2xff3ln2bcj9jxrvn8l00yyvd8nwjsad7ns44lfw5g2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -52603,12 +52604,12 @@ projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }: melpaBuild { pname = "projmake-mode"; - version = "20150619.1420"; + version = "20161031.1015"; src = fetchFromGitHub { owner = "ericbmerritt"; repo = "projmake-mode"; - rev = "25e2f28ca2c528e42c6422735829fc77bab8b451"; - sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn"; + rev = "a897701f7e8f8cc11459ed44eb0e454db2a460c1"; + sha256 = "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df23138073d2416fa6522beca86b7a62eb4d42e3/recipes/projmake-mode"; @@ -52733,8 +52734,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "58580da37357941d502805be3ae520441be77728"; - sha256 = "1kbh8km3zgs7znj88wq6zsk6gj7i2c4qz4520m2ycy3ba2wsxs6n"; + rev = "8fcd24b8dbba46748a9d880a2372736a8b1a6852"; + sha256 = "1kjd21k1xikzq5zm9ybza8qgf64xa9yg44pmhinidyx1vwdhz364"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -52939,12 +52940,12 @@ punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punpun-theme"; - version = "20160527.230"; + version = "20161029.1305"; src = fetchFromGitHub { owner = "wasamasa"; repo = "punpun-theme"; - rev = "48ae2f9d9092b65cf3b4816cdaa6bd52efbd8d45"; - sha256 = "131si1wqv0wvdgwbw58y8w90v6z3nd5rf293144brv9d8853icpy"; + rev = "064e5d10ece4298bb5605259e4558421d0097caf"; + sha256 = "19dbzrn7ghrxnvir65x4zmqv1yr7rcr35z9ckgy564nwnp90v2hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme"; @@ -53446,8 +53447,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "bbffb9b1d160f4d7aacdfe5d3d729abd06766371"; - sha256 = "0ghkslnx07iz0xd1dqgm47imy6030wrwrq99zgnqp8b1ylyz5vmh"; + rev = "3a83a093d14d59d5026c0beae6bf025fe6b4ded7"; + sha256 = "1y9dpp52xyc7aqqs3mpbi1qn661sgi2f899ppi495wqvlr06fpjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -53631,12 +53632,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20160923.548"; + version = "20161029.531"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "d9827cbf410717cd2d6f5f64a70ee64e9ae5b8b3"; - sha256 = "0ggbzjgqgwm0858gp2iyv0zh5337jv2kaswy8af2yqa6vm0fr7gl"; + rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5"; + sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -53967,12 +53968,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161022.1923"; + version = "20161029.1105"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "5279cda4a9385130cf7cc97bbdd33260deb0720d"; - sha256 = "0bjskvkcy1m2k436dwc3aa25pkiqgbl0z86bsm9jaxhcq0122vq0"; + rev = "7b0b8185a12491897c9c6dc83fa5f20c90a67f22"; + sha256 = "1bwp6z2j3ppvv83cqrnan489xcw75ck48y09km3xpngr5d68ph38"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -54048,6 +54049,27 @@ license = lib.licenses.free; }; }) {}; + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "railscasts-reloaded-theme"; + version = "20161027.1033"; + src = fetchFromGitHub { + owner = "thegeorgeous"; + repo = "railscasts-reloaded-theme"; + rev = "d531e5523f35ee937f25931ea7c0dbf712274840"; + sha256 = "107qg9k87caz9kdjsm0q90g3dnnlkm9m6fincvyz0rb45ns2iq5k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; + sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; + name = "railscasts-reloaded-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/railscasts-reloaded-theme"; + license = lib.licenses.free; + }; + }) {}; railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-theme"; @@ -54937,8 +54959,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e4b6e1e482c1a82cade511956b2453b18c50bf26"; - sha256 = "17p07i8z5y2bp923i9sbplq9jn6p5kwscdf6725d7721n0ablpaj"; + rev = "93684fa8ad3dc16b3e298386e857fa822ce7a36e"; + sha256 = "1biwpmv51i5vnrv8m6j21rcqscdzvwryf0wrnx1s13ql5cq880ca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55016,12 +55038,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20160924.1555"; + version = "20161028.1638"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "d1f5ced303957ce602385d6491e25cf1b0068d4f"; - sha256 = "1liflg4nnwy4ara41s1c91g1ahlz9p7r500rbkx201lknspavpkz"; + rev = "9582e47507237dad3513bc6957b35abc432743cc"; + sha256 = "1bcm26mghknp749b3n0v4w7ag3c2q2g30d3j1zypslxcwgllzxs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -56119,12 +56141,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161018.1119"; + version = "20161028.1136"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5f5c617b1b58fa63c852c9170c040274d28d694d"; - sha256 = "0qhj3xysq4xzi6bgsnn484r1h4s8zdym0l98znlf0jml9bzczr74"; + rev = "7cf1d49d9090449c660d024eecb782d3d4fd6aa0"; + sha256 = "1zdmpspghmhrizz6zrilysh0x6704dpg2q0r33h27hhd1lak8091"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56185,7 +56207,7 @@ version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56485"; + rev = "56534"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56265,7 +56287,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56485"; + rev = "56534"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56492,12 +56514,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160909.935"; + version = "20161025.1042"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "1587839ba493b5ab98fb8415338172a9a22f224b"; - sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3"; + rev = "01ac5d8197658c21412acde16df7c39325f03e4d"; + sha256 = "1pylp3xjj9asnnilx1rbghpqgmimvk74sz8fv1r341rlgy1arxrg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -56639,12 +56661,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20161019.446"; + version = "20161026.532"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "ef0c1d2a7e8c162a18c27787ee8cde5b61586e70"; - sha256 = "0jl0qwcbjkhnic91qwglaryddsc60cip24bsh2f5dpjsics7nh0g"; + rev = "ca8930f2f7ba3dcfa6b09d23b9f4cdc5c466d141"; + sha256 = "0mmbx11k8w26mc4f1x43l9nai6s37yjr98wrl4dgz24bg1qh27q1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -56828,12 +56850,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161006.622"; + version = "20161026.350"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "4e21f0673d39231fec070abfb24ab0c18948eb5c"; - sha256 = "1ymkph8ikcsall9waq3vxac8jkji2bl9676pchydqr4ajc3aw8xm"; + rev = "dbca1e2ae1b91ccb2bd10c4231fd01b47c0c6801"; + sha256 = "1216lmx6rwm61kcv7mfp6k1vgln4bbibx77swxr66d0a2qil8rv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -56853,8 +56875,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "cfd46eaa3ab17ff4d1f8cdc348f35d2f9b63c0ce"; - sha256 = "1901y4faw2w29wws26zlhs2lq9md1pcmd1c57n4zjzsp65kdivjg"; + rev = "9e4da33eeebc1a1dee09772d5c2fc9ad13519deb"; + sha256 = "0z025cnb4rfw3gcm2897245hy8png76ax035nmcz5hp4lhsk11l6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -56972,6 +56994,26 @@ license = lib.licenses.free; }; }) {}; + schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "schrute"; + version = "20161024.54"; + src = fetchgit { + url = "https://bitbucket.org/shackra/dwight-k.-schrute"; + rev = "1bfcd4a24ac833448355facc82255344d61d8fa2"; + sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; + sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; + name = "schrute"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/schrute"; + license = lib.licenses.free; + }; + }) {}; scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scion"; @@ -57284,6 +57326,27 @@ license = lib.licenses.free; }; }) {}; + sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: + melpaBuild { + pname = "sdcv"; + version = "20161029.1945"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "sdcv.el"; + rev = "62235bb69b903a5b191ff9935616dddf15fed52c"; + sha256 = "1y2a7132xsi10j9mx0mrpkp947h171rp67n04q0y5smjapvgjjlf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; + sha256 = "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a"; + name = "sdcv"; + }; + packageRequires = [ cl-lib emacs popup pos-tip showtip ]; + meta = { + homepage = "https://melpa.org/#/sdcv"; + license = lib.licenses.free; + }; + }) {}; search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "search-web"; @@ -57614,22 +57677,22 @@ license = lib.licenses.free; }; }) {}; - seoul256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20150714.1535"; + version = "20161025.2120"; src = fetchFromGitHub { - owner = "ChrisDavison"; - repo = "seoul256.el"; - rev = "32790703847b868e8fdd9c0736b0b8a0167f97cf"; - sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc"; + owner = "anandpiyer"; + repo = "seoul256-emacs"; + rev = "2ae4dcbbc62a3befe63d6294b0132cf28076bf80"; + sha256 = "1cchzy8vclwi8fcic54i6hqklwd57l6j6604lii8a4gcr4mhixdx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1aff32f498ec4fd765c346f0c9da44cf919723f2/recipes/seoul256-theme"; - sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme"; + sha256 = "058fadcqz21c22lzf33badibb7hn3w695akh560v10n8750h5wca"; name = "seoul256-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/seoul256-theme"; license = lib.licenses.free; @@ -57741,12 +57804,12 @@ seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seti-theme"; - version = "20150314.122"; + version = "20161028.816"; src = fetchFromGitHub { owner = "caisah"; repo = "seti-theme"; - rev = "f2f472af00f251f8cdced29faadbb3380d3c7ff1"; - sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn"; + rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8"; + sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme"; @@ -58029,12 +58092,12 @@ shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-switcher"; - version = "20160111.2335"; + version = "20161028.2252"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "shell-switcher"; - rev = "bdf28e10a05d7187a4c4440d164ae08ba943b856"; - sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900"; + rev = "28a7f753dd7addd2933510526f52620cb5a22048"; + sha256 = "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher"; @@ -58113,12 +58176,12 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20160624.340"; + version = "20161030.1115"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "822d2e4e791e883ba38ac8bed483a908c60ada1a"; - sha256 = "0zpd1jpyw1243nk7m89x45kn99ly9b64p365v16gdhng3yk2l02c"; + rev = "e7c3da5d817c90588ebc276bd8defa9d497baf69"; + sha256 = "00isccj80g0qdjd15bl2dnlxqvmz2p3nih6v9ljx3vs2jb43pibx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; @@ -58259,10 +58322,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20160816.2247"; + version = "20161027.653"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "1aipl39lh2kym5pc7a8z5sznrrssz327spd6y9cf84agy2k7mv5d"; + sha256 = "0nqf2pdphc820faijnarg4mq3zblsl2dj3scralhxnqwl68ky7ch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -58861,12 +58924,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20160928.2036"; + version = "20161026.857"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c38db1a8c85e6c5940fa14aefd6a767b5e668c9d"; - sha256 = "03a4vk3dbxnyar7rswnnwxazp4pxkxgwqc3akn7ilhdfmx817rrq"; + rev = "c2ac34937ea1ec6e8552405f1b35f2523a0a0a3d"; + sha256 = "0s9c067g8b17njjxg31abx4zklfy6azy2c7dgq636pdql06fbv17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59613,12 +59676,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161015.1227"; + version = "20161029.837"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "768ad1a44e9b4aa49a8539a8353087cbe99eff21"; - sha256 = "0y4gwsdrmxwy017cmabfkmc8q2va13kjxw2zhmn4nz7ykih2pq1h"; + rev = "78a0880499915b52549aacc5de473c6ecccec88a"; + sha256 = "1hfgklrdjlvx3sfnamfs0wv349yy6166x8j240xjsf24gl3yh4jh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -59847,8 +59910,8 @@ src = fetchFromGitHub { owner = "microamp"; repo = "smmry.el"; - rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df"; - sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"; + rev = "986a1b0aec8ab1ef17dbfb7886f47e5558cf738a"; + sha256 = "1gq2066js1kf035217z0n6w0bf0dsyskykf56xycci5s1i7xv2vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry"; @@ -59969,12 +60032,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160913.2031"; + version = "20161026.1857"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "2bceb7f266f71cd85f9b328de02797eb457da17c"; - sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys"; + rev = "d8012ab4661630283c4ac6521a094cbe09ea4707"; + sha256 = "0q7l82zyk0ibk4hby8m014qfjrpyjp15n92p2j3n7hp9fm8fij8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -60480,12 +60543,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161023.535"; + version = "20161024.1259"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "db781c348b2ecdf871445986ef1cb2783c867ea0"; - sha256 = "0zwap27k3gqkzbdg3wsysb34gc540imimagy38l6gin7g0a315ja"; + rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326"; + sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -60564,12 +60627,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161015.1256"; + version = "20161029.531"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "6f1bcf7a6a03e53de24d3d1c49d4186525764f0f"; - sha256 = "15xq91qyj5nw03zr343s0r5x60p4a702bdv9k0pgm85787jrfr86"; + rev = "74b901d5689ee4864c4d552d7052b8f128f77339"; + sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -60686,12 +60749,12 @@ sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-frontend"; - version = "20160606.820"; + version = "20161025.58"; src = fetchFromGitHub { owner = "kostafey"; repo = "sphinx-frontend"; - rev = "e483773ac6b1366ca43128f727e2b3cc2269997f"; - sha256 = "0k8dpqp6hzycbd504zkp7j5ar2zvf6lnn0p60i392g9pj573fnsh"; + rev = "0cbb03361c245382d3e679dded30c4fc1713c252"; + sha256 = "1ksjgd995pcb4lvwip08i8ay0xpin8dcam3hcgnbjjqjg9hja1cf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf72e71f159b9eaaa0834682d5dd4eb258616cf/recipes/sphinx-frontend"; @@ -61102,10 +61165,10 @@ }) {}; sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sr-speedbar"; - version = "20150804.951"; + version = "20161025.131"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el"; - sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i"; + sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar"; @@ -61433,27 +61496,6 @@ license = lib.licenses.free; }; }) {}; - stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "stekene-theme"; - version = "20141108.1211"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "stekene-theme"; - rev = "45b643a5af7dac70997d6a60e69c2f2473337d98"; - sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme"; - sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1"; - name = "stekene-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/stekene-theme"; - license = lib.licenses.free; - }; - }) {}; stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem"; @@ -61738,6 +61780,27 @@ license = lib.licenses.free; }; }) {}; + stylefmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stylefmt"; + version = "20161025.124"; + src = fetchFromGitHub { + owner = "KeenS"; + repo = "stylefmt.el"; + rev = "7a38f26bf8ff947215f34f0a064c7ca80575ccbc"; + sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63af0555576b0430f46d7383d7ea56e1789f43e9/recipes/stylefmt"; + sha256 = "17jj8n8x4ib51a6jdsywcssi6cvxmql9sk7f5clmbi94qxlh48lr"; + name = "stylefmt"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stylefmt"; + license = lib.licenses.free; + }; + }) {}; stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: melpaBuild { pname = "stylus-mode"; @@ -62345,8 +62408,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; + sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63474,8 +63537,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5"; - sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v"; + rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; + sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -63495,8 +63558,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5"; - sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v"; + rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; + sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -63904,8 +63967,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "59cb6661bcee265d39ad524154472ebe27760f1e"; - sha256 = "1dsl3m2l8qh3qp7nnavmxmp50cib8zf6vmd28i9s31cxbm479x90"; + rev = "74c99ba38b02288daf05229cdf34e60261d2d01e"; + sha256 = "0l0ffczgpsvp6znlnnc89nxcmw6yzmxn4dbsr0px3pqz1mffgyp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -64773,12 +64836,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161021.904"; + version = "20161027.848"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "a84c48b3c3fbbd56aa990f1807670f5cdb28c0ef"; - sha256 = "0fppkpy5brxx79gglga510swnd0fiw43i87zisvc9ivykbigiys1"; + rev = "6ea2305e267e5efb42bfa2187279ea3b7d1a555e"; + sha256 = "0p81gdrbwvba7xnpapgwrmssizkfj4rwxxipr76c4lzdmz1am03w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -66086,12 +66149,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20161017.1640"; + version = "20161031.1025"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6"; - sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk"; + rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; + sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -66398,6 +66461,27 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "vc-fossil"; + version = "20161030.842"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "vc-fossil"; + rev = "066a1c591c18102d199407e303ccdd0dd8c26be9"; + sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil"; + sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081"; + name = "vc-fossil"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/vc-fossil"; + license = lib.licenses.free; + }; + }) {}; vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; @@ -66968,12 +67052,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20150101.718"; + version = "20161030.840"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"; - sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng"; + rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0"; + sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -67007,12 +67091,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20160531.1719"; + version = "20161026.1359"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "3f650c04dd1b823a4dc3c7e965ea50c1dfc5645c"; - sha256 = "0wjfpgypdii7y2zp2c3yb6pmgpcza11ds2x3dya4syn6ll7zhgz9"; + rev = "a332f96c38a512c645c110c04f4a8315429bd2e2"; + sha256 = "15284r6hx96mwjigw13ikzqjm9irj4vklwsikawym37dyz75h4nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode"; @@ -67254,12 +67338,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161018.938"; + version = "20161029.2147"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "5de8cfb87e6e5ed953aa229de0bf19a965367735"; - sha256 = "1rwsi9d4lik5jx9y9fbknjkjqjpky2mc8piyziihcq3hk16vdkgr"; + rev = "8cd89d439515331a96facdcf3eb3eb424819c2e8"; + sha256 = "107p0yrfp4lpm1clzls78f8ylmr6fpjjz467pf0vyygnd5xhxf4r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -67359,12 +67443,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "20131121.826"; + version = "20161031.648"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "c465751b434b20f848f0b8fa2b4e2dec5717f217"; - sha256 = "1j1k3ab0ymr66w23z3r4yd1g6410n5y80jfyg2f9i9rdk7vq18gd"; + rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; + sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -67799,12 +67883,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161005.1154"; + version = "20161031.1056"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "a6a9f352e735f3d7faf45d0e8f23f3a346c04f9c"; - sha256 = "06h2yc73z4vj2pzf16v78whh83zrvv1zsl6hvhwylgys1vn2ssk5"; + rev = "4b01b44c6718168be9553043124c3efd766abbc1"; + sha256 = "0kjrwaarrwrnxqbq8w23fs2j9nfv394lzpkzzjpakaaqfbzc1ck7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68336,8 +68420,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "b9e861ccb52d"; - sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2"; + rev = "9f38303df3b7"; + sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -68836,12 +68920,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20160624.1104"; + version = "20161030.1736"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "70c5b1092484a031f3a3d9334399f14aef449df8"; - sha256 = "0q31mcz9bx19y517y1pli4znqxflvmvjf2k5wsi8sld7f5w4wwix"; + rev = "208810ea93214491e6e2329cdbf81de85437939a"; + sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -68857,12 +68941,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161017.1807"; + version = "20161025.341"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "33805b3ec7c8881c32584cdbfb1e4b2719b53d7e"; - sha256 = "1ja8aqg01s9i5sa2prfr7f809ak42ic63jldw022z3jjag0qn7jm"; + rev = "0dc80c428cc48dfbb411b77588db7030903705b6"; + sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -68878,12 +68962,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161024.900"; + version = "20161025.338"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "a225039d38e5bb61ae89066e4528ca7c2d792984"; - sha256 = "0qa6c498sm2sdh0pjci0hqpihp4ccs8hj1p7h3wks6kz3c3xr42a"; + rev = "061d493b6e47aa96f9a3bea107b3586b21caab8b"; + sha256 = "0vhp81gr9lhwbq237fixmwjq1kipl5d2apy48hicgdzi1a8wcahv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -68920,12 +69004,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161016.459"; + version = "20161026.2246"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "f9849ddd3b128628e4e9632e1e21edb8c904cb38"; - sha256 = "14dc0lwmh4zf8whj3m65nsxvadqqmhr6kiymrx6vykwbsj4lzfiq"; + rev = "161266e31b27fd060be56550f413e58e0436c04b"; + sha256 = "0b4g9xvi9v6qy3ijia800ph6j7cq06k72sc56kb7dkcgnjk9nxcm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69319,12 +69403,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161013.1627"; + version = "20161029.2045"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "9c850434b398f5e758b0e6ff6d9ce8f7351521f0"; - sha256 = "14h46z8hqyx4135adj3lqbfpkaxlnvky7x4sfsnxbx82zqlcqnac"; + rev = "89251eb9ddde4246e7c2b0a177706c6294ef4bea"; + sha256 = "1sn95gzw6ivniwci9czmb8mssz4cqbbzr9clsdh2pnxxmx1kx3xd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -69424,12 +69508,12 @@ xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xwidgete"; - version = "20160719.324"; + version = "20161029.1112"; src = fetchFromGitHub { owner = "tuhdo"; repo = "xwidgete"; - rev = "943d715f2caab69f76d0de9bd4387cf60f6c4fe3"; - sha256 = "0wrb8cvm3ap9y212z3fxc6shbzk0xv1jbw47rnbxgl97asq7rcaj"; + rev = "adcf3f84772f4a382ba791a6584fa7dddfafdcdd"; + sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete"; @@ -69757,12 +69841,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161022.646"; + version = "20161026.1601"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "eaaec309b19ea704dddb265bcd3d9e09c9996265"; - sha256 = "1ckj1d053v74m2kchd2lbr3qrdmn0d7p9l0lwnpjl63yzvhkfjid"; + rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; + sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -69782,8 +69866,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "90c14d2e2b8247eeba464a52560af484f8542558"; - sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; + rev = "da42cb16c4534eb31c5946bf7f5a5710ef57256d"; + sha256 = "09ag32gbmidp12w3pay5iid6b75zwdm317hsz2kdvslik18j7r66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -69841,12 +69925,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161018.2336"; + version = "20161030.1222"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "140079b822452b141ce022bbf082deae17edd6d3"; + sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -69955,12 +70039,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20160725.2044"; + version = "20161027.2344"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "675ee27456fb454562b249cad768d4a5207a6b4e"; - sha256 = "131q95x9zvzayfn0slyzjyl87fap9j16bfdlc449khfp0zymcbla"; + rev = "2ca9f1070197bd6af7807bca6a1f2099c7b3ed1c"; + sha256 = "1l7kzmhkjnfy32l0kw3xnqs3dipmsad2ckcx7plvfwfh75yrddq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -70079,12 +70163,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: melpaBuild { pname = "zerodark-theme"; - version = "20161014.1000"; + version = "20161025.916"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "166998e69a83535618dc4e79715e203fc340d513"; - sha256 = "1ac5vqg9v6qj37xjw3xjlv47iyh5wwy59xwzah9pdi587224jcfv"; + rev = "62fde99acdd1b1e149300903a7e4f03257019602"; + sha256 = "0zi43l26fwqpd97bz4spwqr2k3df279m26wb74wygl5rkj1v01lk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -70452,12 +70536,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20160925.719"; + version = "20161026.1249"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "e5eb534859acc0cc0a13403fd166457db9fb7eb5"; - sha256 = "158lzqsjpm1zlkq4c2hvg3s8z5yp30g0qj5wk2r1j3svfz4q9nl9"; + rev = "6826c3f3f3735fbf060206072392d67f0990f817"; + sha256 = "1ybrx6p9i55zsjnxa7cgali6x77aam2h55b8g5fqw23wnvr11x4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; From a8a1449b1c6c129338d80be2420343fb2dd76499 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 01:36:09 +0100 Subject: [PATCH 039/336] zita-resampler: 1.3.0 -> 1.6.0 --- pkgs/development/libraries/audio/zita-resampler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 3f3627b6b23..7aa7244e234 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "zita-resampler-${version}"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"; + sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h"; }; makeFlags = [ From d525f2062fda3225bac8a521ec6e4b5027b06fc5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 02:03:41 +0100 Subject: [PATCH 040/336] audacity: add jack and lv2 capabilities --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b31cecffbd1..cc96f6dbbb3 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, + libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag gtk2 + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms From 2d62522c534ebf32d54f857cdb470e8c37e87c5b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 02:10:35 +0100 Subject: [PATCH 041/336] ardour5: add dummy backend, so Ardour Session Utilities get built --- pkgs/applications/audio/ardour/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b7ea32cd1d4..ab228766e13 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patchShebangs ./tools/ ''; - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; + configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out"; buildPhase = "${python2.interpreter} waf"; From 0d16b3fe59af9628f2082701e36c74655a98dcb8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 02:16:03 +0100 Subject: [PATCH 042/336] guitarix: 0.35.1 -> 0.35.2 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 4fd68742ba2..e0bca0fa1c8 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.1"; + version = "0.35.2"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6"; + sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ]; From 26686a4f9baa253542c1df53da63335b25913692 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 02:28:34 +0100 Subject: [PATCH 043/336] helm: 0.6.1 -> 0.8.6 --- pkgs/applications/audio/helm/default.nix | 30 +++++++++++++++--------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index b4cf0288672..712f309fad0 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,15 +1,16 @@ - { stdenv, fetchurl, xorg, freetype, alsaLib, libjack2 + { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2 , lv2, pkgconfig, mesa }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.8.6"; name = "helm-${version}"; - src = fetchurl { - url = "https://github.com/mtytel/helm/archive/v${version}.tar.gz"; - sha256 = "18d7zx6r7har47zj6x1f2z91x796mxnix7w3x1yilmqnyqc56r3w"; - }; - + src = fetchFromGitHub { + owner = "mtytel"; + repo = "helm"; + rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489"; + sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8"; + }; buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext @@ -17,11 +18,18 @@ freetype alsaLib libjack2 pkgconfig mesa lv2 ]; + CXXFLAGS = "-DHAVE_LROUND"; + + patchPhase = '' + sed -i 's|usr/||g' Makefile + ''; + + buildPhase = '' + make lv2 + ''; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/lv2 - cp -a standalone/builds/linux/build/* $out/bin - cp -a builds/linux/LV2/* $out/lib/lv2/ + make DESTDIR="$out" install ''; meta = with stdenv.lib; { From 9cd790cffcf8e1cb210355926434a9c6e839bae0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 1 Nov 2016 14:09:35 +0800 Subject: [PATCH 044/336] dropbox: 12.4.22 -> 13.4.21 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9639fe9e74a..d10e787b6ff 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "12.4.22"; + version = "13.4.21"; sha256 = { - "x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y"; - "i686-linux" = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr"; + "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4"; + "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 5f60295b029601c1bb4b76df27a53fd9605fa026 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 1 Nov 2016 00:53:26 +0200 Subject: [PATCH 045/336] syncthing-inotify: 0.8.3 -> 0.8.4 --- .../networking/syncthing/inotify-deps.nix | 21 ++++++------------- .../networking/syncthing/inotify.nix | 4 ++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix index 302e5ee10e1..7b0be65c8af 100644 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -4,17 +4,8 @@ fetch = { type = "git"; url = "https://github.com/cenkalti/backoff"; - rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; - sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "ce6abff51712df5da11095fb41dd4b0353559797"; - sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; + sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; }; } { @@ -22,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/syncthing/syncthing"; - rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; - sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + rev = "7fba8cf759a3b48cfc1507a8c32355865500a571"; + sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5"; }; } { @@ -31,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/zillode/notify"; - rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; - sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + rev = "df33c1a773b462f936a149c36696c018c047eaa9"; + sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s"; }; } ] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index f1343d4a67e..cf630d42756 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "syncthing-inotify-${version}"; - version = "0.8.3"; + version = "0.8.4"; goPackagePath = "github.com/syncthing/syncthing-inotify"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "syncthing"; repo = "syncthing-inotify"; rev = "v${version}"; - sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; + sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw"; }; goDeps = ./inotify-deps.nix; From 70bf49318547f81b6cf8f0454595b30bf80f54ad Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 30 Oct 2016 19:28:30 +0100 Subject: [PATCH 046/336] obnam: 1.19.1 -> 1.20.2 --- pkgs/tools/backup/obnam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 048321ea2e5..ef7299966a7 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; - version = "1.19.1"; + version = "1.20.2"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc"; + sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq"; }; buildInputs = [ pythonPackages.sphinx attr ]; From 31f8367c67cd7d1542d58750589b752bc0f09ee0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 29 Oct 2016 16:58:35 +0200 Subject: [PATCH 047/336] haskellPackages.dataenc: jailbreak Relaxes overly strict bounds on base (3 > && < 4.8). The dataenc package is unmaintained so there is no corresponding upstream issue. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50bb3695a71..384d308f1c0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1041,4 +1041,8 @@ self: super: { http-conduit = self.http-conduit_2_2_3; }); + # https://hydra.nixos.org/build/42769611/nixlog/1/raw + # note: the library is unmaintained, no upstream issue + dataenc = doJailbreak super.dataenc; + } From 09465c9f7a978752a7a1be7088059c60e6552bd3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 1 Nov 2016 14:54:21 +0200 Subject: [PATCH 048/336] syncthing-inotify: fix building on darwin --- pkgs/applications/networking/syncthing/inotify.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index cf630d42756..8d9a813f961 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -25,6 +25,8 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/etc/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; { From 33aac6e4c9d21ccd8cb7906445f96aa9607cb052 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Nov 2016 08:54:53 -0400 Subject: [PATCH 049/336] scala: Fix hash --- pkgs/development/compilers/scala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a1b131eac81..adee23531e0 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "148wmk7gjiyfms9lrwgiky7vw78pwnvpnx71rg4l30zd6jfiknp9"; + sha256 = "1g34fw2nib9bzk1qw68a4wvh4zy09y5yqvnlq4yw250f6lqfi17r"; }; propagatedBuildInputs = [ jre ] ; From 874abe694afe122feebd8665c71663af97b46cd6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Nov 2016 08:58:53 -0400 Subject: [PATCH 050/336] linux: 4.8.5 -> 4.8.6 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 0a2da165638..b3a5e97e5d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.5"; + version = "4.8.6"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8"; + sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l"; }; kernelPatches = args.kernelPatches; From 3f61621354b0ec75ce35912c3b12ea0d544bf190 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 1 Nov 2016 10:13:33 -0400 Subject: [PATCH 051/336] pythonPackages.cached-property: works on Darwin --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 185043b27e3..e8ba6e57b84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2199,7 +2199,7 @@ in { description = "A decorator for caching properties in classes"; homepage = https://github.com/pydanny/cached-property; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ericsagnes ]; }; }; From 98d1bb9e6e63a027123d02d6f21005947cd2a515 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 1 Nov 2016 14:21:23 +0100 Subject: [PATCH 052/336] tinyxml-2: 3.0.0 -> 4.0.1 --- .../libraries/tinyxml-2/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 6c77f6a004a..9011d33e922 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, cmake }: -let version = "3.0.0"; -in stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { name = "tinyxml-2-${version}"; - src = fetchurl { - url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz"; - sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj"; + version = "4.0.1"; + + src = fetchFromGitHub { + repo = "tinyxml2"; + owner = "leethomason"; + rev = version; + sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y"; }; nativeBuildInputs = [ cmake ]; meta = { + description = "A simple, small, efficient, C++ XML parser"; + homepage = http://www.grinninglizard.com/tinyxml2/index.html; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.zlib; }; } From 0ee7d1ea4ee5d3d169bfb7940c105790d3c6b388 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 1 Nov 2016 14:25:39 +0100 Subject: [PATCH 053/336] encfs: 1.8.1 -> 1.9.1 Packaging changes - Uses cmake - Removes depends on rlog and boost, uses tinyxml to parse xml Note that the encfssh utility is disabled, it requires patching to work (and didn't work in previous versions of the package, either). Better to leave it unusable until fixed. --- pkgs/tools/filesystems/encfs/default.nix | 27 +++++++++++++----------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index d0d9fa02178..518edbb3ea4 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl -, pkgconfig, rlog }: +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, perl +, gettext, fuse, openssl, tinyxml2 +}: stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { - sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; + sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; }; - buildInputs = [ boost fuse openssl rlog ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + buildInputs = [ gettext fuse openssl tinyxml2 ]; + nativeBuildInputs = [ cmake pkgconfig perl ]; - configureFlags = [ - "--with-boost-serialization=boost_wserialization" - "--with-boost-filesystem=boost_filesystem" - ]; + cmakeFlags = + [ "-DUSE_INTERNAL_TINYXML=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_LIBENCFS=ON" + ]; enableParallelBuilding = true; meta = with stdenv.lib; { + description = "An encrypted filesystem in user-space via FUSE"; homepage = https://vgough.github.io/encfs; - description = "Provides an encrypted filesystem in user-space via FUSE"; - license = licenses.lgpl2; + license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 262e4e058b3..9a4614b6e5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1517,7 +1517,9 @@ in enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; - encfs = callPackage ../tools/filesystems/encfs { }; + encfs = callPackage ../tools/filesystems/encfs { + tinyxml2 = tinyxml-2; + }; enscript = callPackage ../tools/text/enscript { }; From cfbb419cb10131a010cb4122cd4ca3cb4a020f16 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Nov 2016 10:04:58 -0500 Subject: [PATCH 054/336] zotero: remove ttuegel from maintainers I don't use Zotero at all anymore, and the Firefox plugin was much more reliable than the standalone version in my experience. --- pkgs/applications/office/zotero/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3cb7ed491fb..1e4ed37e93d 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation { description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; }; } From 0607fa18740f1c41b522c43f4f2422888354a901 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 29 Oct 2016 17:08:18 +0200 Subject: [PATCH 055/336] gnubg: fix build Presumably, readline used to be propagated from one of the other inputs but is no longer (the build succeeds on 16.09 but is unable to locate readline.h on master). https://hydra.nixos.org/build/42761215 --- pkgs/games/gnubg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 80cc7763266..e74177a1ee3 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, gtk2 }: +{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: let version = "1.04.000"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6"; }; - buildInputs = [ pkgconfig python glib gtk2 ]; + buildInputs = [ pkgconfig python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; From 270365a1ee513a0d3d274c7426a153ab8e971036 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Tue, 1 Nov 2016 19:14:43 +0200 Subject: [PATCH 056/336] samsung-unified-linux-driver: add 4.01.17 --- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 82 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/misc/cups/drivers/samsung/4.01.17.nix diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix new file mode 100644 index 00000000000..b30b4c4a2c1 --- /dev/null +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -0,0 +1,82 @@ +# Tested on linux-x86_64. Might work on linux-i386. Probably won't work on anything else. + +# To use this driver in NixOS, add it to printing.drivers in configuration.nix. +# configuration.nix might look like this when you're done: +# { pkgs, ... }: { +# printing = { +# enable = true; +# drivers = [ pkgs.samsung-unified-linux-driver_4_01_17 ]; +# }; +# (more stuff) +# } +# (This advice was tested on the 1st November 2016.) + +{ stdenv, fetchurl, cups, libusb }: + +# Do not bump lightly! Visit +# to see what will break when upgrading. Consider a new versioned attribute. +let + installationPath = if stdenv.system == "x86_64-linux" then "x86_64" else "i386"; + appendPath = if stdenv.system == "x86_64-linux" then "64" else ""; + libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; +in stdenv.mkDerivation rec { + name = "samsung-UnifiedLinuxDriver-${version}"; + version = "4.01.17"; + + src = fetchurl { + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0"; + }; + + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + cd Linux/${installationPath} + mkdir -p $out/lib/cups/{backend,filter} + install -Dm755 mfp $out/lib/cups/backend/ + install -Dm755 pstosecps pstospl pstosplc rastertospl rastertosplc $out/lib/cups/filter/ + install -Dm755 libscmssc.so $out/lib/ + + GLOBIGNORE=*.so + for exe in $out/lib/cups/**/*; do + echo "Patching $exe" + patchelf \ + --set-rpath ${libPath} \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $exe + done + unset GLOBIGNORE + + install -v at_root/usr/lib${appendPath}/libmfp.so.1.0.1 $out/lib + cd $out/lib + ln -s -f libmfp.so.1.0.1 libmfp.so.1 + ln -s -f libmfp.so.1 libmfp.so + + for lib in $out/lib/*.so; do + echo "Patching $lib" + patchelf \ + --set-rpath ${libPath} \ + $lib + done + + mkdir -p $out/share/cups/model/samsung + cd - + cd ../noarch/at_opt/share/ppd + for i in *.ppd; do + sed -i $i -e \ + "s,pstosecps,$out/lib/cups/filter/pstosecps,g; \ + s,pstospl,$out/lib/cups/filter/pstospl,g; \ + s,rastertospl,$out/lib/cups/filter/rastertospl,g" + done; + cp -r ./* $out/share/cups/model/samsung + ''; + + meta = with stdenv.lib; { + description = "Samsung's Linux printing drivers; includes binaries without source code"; + homepage = http://www.samsung.com/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ joko ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a4614b6e5c..757981015d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17166,6 +17166,7 @@ in mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; + samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; sane-backends = callPackage ../applications/graphics/sane/backends { From fac1168816a132694a3f21f2e00654f69ab44e5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2016 18:29:43 +0100 Subject: [PATCH 057/336] callHackage: make 'all-cabal-hashes' repository overridable This commit changes callHackage to use a deterministic version of the Hackage checkout from https://github.com/commercialhaskell/all-cabal-hashes by default. This means that packages uploaded to Hackage after today will be available to callHackage only after "pkgs/data/misc/hackage/default.nix" has been updated. People who want the previous behavior where we always had the latest version of Hackage available -- at the cost of frequent downloads from Github --, can add the following override to their "~/.nixpkgs/config.nix" file: { packageOverrides = super: { all-cabal-hashes = builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"; }; } --- pkgs/data/misc/hackage/default.nix | 11 +++++++++++ pkgs/development/haskell-modules/default.nix | 14 +++----------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 pkgs/data/misc/hackage/default.nix diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix new file mode 100644 index 00000000000..812362d6b30 --- /dev/null +++ b/pkgs/data/misc/hackage/default.nix @@ -0,0 +1,11 @@ +{ fetchFromGitHub }: + +# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz" +# instead if you want the latest Hackage automatically at the price of frequent re-downloads. + +fetchFromGitHub { + owner = "commercialhaskell"; + repo = "all-cabal-hashes"; + rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec"; + sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm"; +} diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 9020f1ee467..0c72173d2d0 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc +{ pkgs, stdenv, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -6,14 +6,6 @@ let - allCabalFiles = stdenv.mkDerivation { - name = "all-cabal-hashes-0"; - buildCommand = '' - mkdir -p $out - tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"} - ''; - }; - inherit (stdenv.lib) fix' extends; haskellPackages = self: @@ -69,8 +61,8 @@ let installPhase = '' export HOME="$TMP" mkdir $out - hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json) - cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix + hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json) + cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix ''; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a4614b6e5c..1bd3e6d63f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4821,6 +4821,8 @@ in postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; }); + all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; + inherit (ocamlPackages) haxe; hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; From a1b80797c4891d4a5e932ab56fde5534132e9f45 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 1 Nov 2016 17:35:04 +0000 Subject: [PATCH 058/336] partd: 0.3.3 -> 0.3.6 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 185043b27e3..0c4a44bd829 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17692,11 +17692,11 @@ in { partd = buildPythonPackage rec { name = "partd-${version}"; - version = "0.3.3"; + version = "0.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/p/partd/${name}.tar.gz"; - sha256 = "0fgrkfhgpm0hf5gs6wvgv7p9ls2kvgk0mc5hkmjw5slfbkn3fz8v"; + sha256 = "1wl8kifdljnpbz0ls7mbbc9j23fc5xzm639im7h88spyg02w68hm"; }; buildInputs = with self; [ pytest ]; @@ -17704,6 +17704,7 @@ in { propagatedBuildInputs = with self; [ locket numpy pandas pyzmq toolz ]; checkPhase = '' + rm partd/tests/test_zmq.py # requires network & fails py.test ''; From a25e6bc8dbeac64de77b81c46d9116989b2b483c Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 1 Nov 2016 17:06:39 -0200 Subject: [PATCH 059/336] lumina: init at 1.1.0-p1 --- .../services/x11/desktop-managers/default.nix | 3 +- .../services/x11/desktop-managers/lumina.nix | 52 ++++++++++++++ pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch | 26 +++++++ .../avoid-absolute-path-on-sessdir.patch | 11 +++ pkgs/desktops/lumina/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/lumina.nix create mode 100644 pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch create mode 100644 pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch create mode 100644 pkgs/desktops/lumina/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 31412ae7014..144e4aada27 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,8 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix + ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix new file mode 100644 index 00000000000..f0b31a2acb0 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.lumina; + +in + +{ + options = { + + services.xserver.desktopManager.lumina.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Lumina desktop manager"; + }; + + }; + + + config = mkIf (xcfg.enable && cfg.enable) { + + services.xserver.desktopManager.session = singleton { + name = "lumina"; + start = '' + exec ${pkgs.lumina}/bin/start-lumina-desktop + ''; + }; + + environment.systemPackages = [ + pkgs.fluxbox + pkgs.kde5.kwindowsystem + pkgs.kde5.oxygen-icons5 + pkgs.lumina + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; + + # Link some extra directories in /run/current-system/software/share + environment.pathsToLink = [ + "/share/desktop-directories" + "/share/icons" + "/share/lumina" + "/share" + ]; + + }; +} diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch new file mode 100644 index 00000000000..6ddd9c76591 --- /dev/null +++ b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch @@ -0,0 +1,26 @@ +diff --git a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +index b92d1b0..441b1bf 100644 +--- a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp ++++ b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +@@ -13,17 +13,17 @@ + //can't read xbrightness settings - assume invalid until set + static int screenbrightness = -1; + +-QString LOS::OSName(){ return "Gentoo Linux"; } ++QString LOS::OSName(){ return "NixOS"; } + + //OS-specific prefix(s) + // NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in + QString LOS::LuminaShare(){ return (L_SHAREDIR+"/lumina-desktop/"); } //Install dir for Lumina share files +-QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications +-QString LOS::SysPrefix(){ return "/"; } //Prefix for system ++QString LOS::AppPrefix(){ return PREFIX+"/usr"; } //Prefix for applications ++QString LOS::SysPrefix(){ return PREFIX; } //Prefix for system + + //OS-specific application shortcuts (*.desktop files) + QString LOS::ControlPanelShortcut(){ return ""; } //system control panel +-QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/porthole.desktop"; } //graphical app/pkg manager ++QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager + //OS-specific RSS feeds (Format: QStringList[ :::: ]; ) + QStringList LOS::RSSFeeds(){ return QStringList(); } + diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch new file mode 100644 index 00000000000..f5ef6cba41f --- /dev/null +++ b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch @@ -0,0 +1,11 @@ +diff -Naur lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri +--- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri 2016-08-09 12:04:30.000000000 -0300 ++++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri 2016-08-13 17:32:18.272137900 -0300 +@@ -55,7 +55,6 @@ + #Use the defaults for everything else + + }else : linux-*{ +- L_SESSDIR=/usr/share/xsessions + OS=Linux + LIBS += -L/usr/local/lib -L/usr/lib -L/lib + diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix new file mode 100644 index 00000000000..66229420cf6 --- /dev/null +++ b/pkgs/desktops/lumina/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, + numlockx, xorg, qt5, kde5 +}: + +stdenv.mkDerivation rec { + name = "lumina-${version}"; + version = "1.1.0-p1"; + + src = fetchFromGitHub { + owner = "trueos"; + repo = "lumina"; + rev = "v${version}"; + sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m"; + }; + + nativeBuildInputs = [ + qt5.qmakeHook + qt5.qttools + ]; + + buildInputs = [ + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + qt5.qtbase + qt5.qtsvg + qt5.qtmultimedia + qt5.qtx11extras + kde5.oxygen-icons5 + fluxbox + xscreensaver + desktop_file_utils + numlockx + ]; + + patches = [ + ./avoid-absolute-path-on-sessdir.patch + ./LuminaOS-NixOS.cpp.patch + ]; + + prePatch = '' + # Copy Gentoo setup as NixOS setup and then patch it + # TODO: write a complete NixOS setup? + cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp + ''; + + postPatch = '' + # Fix location of fluxbox styles + substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ + --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + ''; + + qmakeFlags = [ "LINUX_DISTRO=NixOS" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A lightweight, portable desktop environment"; + longDescription = '' + The Lumina Desktop Environment is a lightweight system interface + that is designed for use on any Unix-like operating system. It + is based on QT5. + ''; + homepage = https://lumina-desktop.org; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd483d4777..616ca20fe77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16206,6 +16206,8 @@ in in makeOverridable makePackages extra; + lumina = callPackage ../desktops/lumina { }; + lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { }); mate = recurseIntoAttrs (callPackage ../desktops/mate { From 7940692801dff8f94bb2ec87e0d3b4cd3de4038a Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 1 Nov 2016 20:53:07 +0100 Subject: [PATCH 060/336] ksysguard: Add required qtwebkit dependency. Without this the only the daemon would be built without a GUI. --- pkgs/desktops/kde-5/plasma/ksysguard.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix index b0e94c6a595..dcde867dffa 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -1,6 +1,6 @@ { plasmaPackage, ecm, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard +, kiconthemes, libksysguard, qtwebkit }: plasmaPackage { @@ -8,6 +8,6 @@ plasmaPackage { nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n + kdelibs4support ki18n qtwebkit ]; } From 0b180d1ca4d7082ce86a04baffcf257335e0a120 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2016 22:12:13 +0100 Subject: [PATCH 061/336] bind: update to 9.10.4-P4 to fix CVE-2016-8864 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 810fabb253f..8cb96d445c8 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P3"; in +let version = "9.10.4-P4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1vxs29w4hnl7jcd7sknga58xv1qk2rcpsxyich7cpp7xi77faxd0"; + sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; }; outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; From 03200ab74bd2fc5e40517c7d73189d8686dbd38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 1 Nov 2016 22:00:03 +0100 Subject: [PATCH 062/336] sg3_utils: 1.31 -> 1.42 --- pkgs/tools/system/sg3_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index e2fa8eacc91..e0f30b2db73 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.31"; + name = "sg3_utils-1.42"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq"; + sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx"; }; meta = { From 5ecb427368cea76a2ea493b643f82d870b1e8cef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2016 22:47:52 +0100 Subject: [PATCH 063/336] cudatoolkit: Add 8.0.44 --- pkgs/development/compilers/cudatoolkit/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 7037bf3808f..f74815a3b95 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -116,5 +116,11 @@ in { sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; }; + cudatoolkit8 = common { + version = "8.0.44"; + url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run; + sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bd3e6d63f4..ee627a0deb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1263,9 +1263,10 @@ in cudatoolkit6 cudatoolkit65 cudatoolkit7 - cudatoolkit75; + cudatoolkit75 + cudatoolkit8; - cudatoolkit = cudatoolkit7; + cudatoolkit = cudatoolkit8; cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; From 5926192e553f614aeed006cdf3b304f43fdcf148 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2016 22:49:12 +0100 Subject: [PATCH 064/336] blender: 2.78 -> 2.78a --- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 734364b9ccd..e07fa1df546 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78"; + name = "blender-2.78a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp"; + sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee627a0deb0..24b85eff7ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8701,7 +8701,7 @@ in }; opensubdiv = callPackage ../development/libraries/opensubdiv { - cudatoolkit = cudatoolkit75; + cudatoolkit = cudatoolkit8; }; openwsman = callPackage ../development/libraries/openwsman {}; @@ -12168,7 +12168,7 @@ in bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - cudatoolkit = cudatoolkit75; + cudatoolkit = cudatoolkit8; python = python35; }; From 83317f7d04644ad207e95c639d08e35907d3964d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 1 Nov 2016 18:36:27 +0100 Subject: [PATCH 065/336] haskellPackages: fix libsystemd-journal --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 384d308f1c0..e957f90953f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1045,4 +1045,10 @@ self: super: { # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; + libsystemd-journal = overrideCabal super.libsystemd-journal (old: { + # https://github.com/ocharles/libsystemd-journal/pull/17 + jailbreak = true; + librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; + }); + } From 08d7fbb42d37994ad0a4f736f5585d6b584b4b87 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Sun, 30 Oct 2016 12:12:01 +1030 Subject: [PATCH 066/336] matrix-synapse: Allow keys to be generated The matrix-synapse user has `createHome = true;` which runs before the `preStart` script, so the home directory will always exist and the block will never execute. Also don't include default path to keys in the configuration file, because synapse will choke if it tries to open them before they exist (even with `--generate-keys`). --- .../modules/services/misc/matrix-synapse.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 4145f8fa957..277fc9a3902 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -9,11 +9,15 @@ let mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; fromBool = x: if x then "true" else "false"; configFile = pkgs.writeText "homeserver.yaml" '' +${optionalString (cfg.tls_certificate_path != null) '' tls_certificate_path: "${cfg.tls_certificate_path}" +''} ${optionalString (cfg.tls_private_key_path != null) '' tls_private_key_path: "${cfg.tls_private_key_path}" ''} +${optionalString (cfg.tls_dh_params_path != null) '' tls_dh_params_path: "${cfg.tls_dh_params_path}" +''} no_tls: ${fromBool cfg.no_tls} ${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} @@ -146,8 +150,9 @@ in { ''; }; tls_certificate_path = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.crt"; + type = types.nullOr types.str; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.crt"; description = '' PEM encoded X509 certificate for TLS. You can replace the self-signed certificate that synapse @@ -158,16 +163,17 @@ in { }; tls_private_key_path = mkOption { type = types.nullOr types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.key"; - example = null; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.key"; description = '' PEM encoded private key for TLS. Specify null if synapse is not speaking TLS directly. ''; }; tls_dh_params_path = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.dh"; + type = types.nullOr types.str; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.dh"; description = '' PEM dh parameters for ephemeral keys ''; @@ -557,12 +563,10 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - if ! test -e /var/lib/matrix-synapse; then - mkdir -p /var/lib/matrix-synapse - chmod 700 /var/lib/matrix-synapse - chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse - ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys - fi + ${cfg.package}/bin/homeserver \ + --config-path ${configFile} \ + --keys-directory /var/lib/matrix-synapse \ + --generate-keys ''; serviceConfig = { Type = "simple"; @@ -570,7 +574,7 @@ in { Group = "matrix-synapse"; WorkingDirectory = "/var/lib/matrix-synapse"; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}"; + ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse"; }; }; }; From f00e28164b343606e514fd43cd5b225dd30cd6dd Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Wed, 2 Nov 2016 10:30:34 +0100 Subject: [PATCH 067/336] pdfjam: remove obsolete version pdfjam is included in texlive fixes #19826 --- pkgs/tools/typesetting/pdfjam/builder.sh | 9 --------- pkgs/tools/typesetting/pdfjam/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 30 deletions(-) delete mode 100644 pkgs/tools/typesetting/pdfjam/builder.sh delete mode 100644 pkgs/tools/typesetting/pdfjam/default.nix diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh deleted file mode 100644 index 720ddeae78d..00000000000 --- a/pkgs/tools/typesetting/pdfjam/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -tar zxvf $src - -mkdir -p $out/bin -cp pdfjam/bin/* $out/bin - -mkdir -p $out/man/man1 -cp pdfjam/man1/* $out/man/man1 diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix deleted file mode 100644 index f8eafb221a3..00000000000 --- a/pkgs/tools/typesetting/pdfjam/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "pdfjam-${version}"; - version = "2.08"; - url-version = stdenv.lib.replaceChars ["."] [""] version; - - builder = ./builder.sh; - - src = fetchurl { - url = "http://go.warwick.ac.uk/pdfjam/pdfjam_${url-version}.tgz"; - sha256 = "1wy0xhcy27d7agby598s20ba48s4yg5qkzr6anc6q1xdryccacf7"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.mornfall ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f72a57f9bb1..3b241dc2376 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3142,8 +3142,6 @@ in pdf2svg = callPackage ../tools/graphics/pdf2svg { }; - pdfjam = callPackage ../tools/typesetting/pdfjam { }; - pdfmod = callPackage ../applications/misc/pdfmod { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; From 1e1609da6ad87fe828973f17f1f175b3de841383 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Nov 2016 10:38:17 +0100 Subject: [PATCH 068/336] curl: 7.50.3 -> 7.51.0 Fixes 11 CVEs: https://curl.haxx.se/changes.html#7_51_0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 958bea34e7d..56c0d26a999 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.3"; + name = "curl-7.51.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; + sha256 = "1pldg1d8606p4q83k8fcp61kfcsbphln22mycw7h7r87i42410kz"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From d32b95c9667f07f99551e72c1217bece4ec2327f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 2 Nov 2016 10:37:54 +0100 Subject: [PATCH 069/336] kile: 2016-07-25 -> 2016-10-24 --- pkgs/applications/editors/kile/frameworks.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix index c16dce1eccc..7a02c3d3f8c 100644 --- a/pkgs/applications/editors/kile/frameworks.nix +++ b/pkgs/applications/editors/kile/frameworks.nix @@ -24,12 +24,12 @@ let unwrapped = kdeDerivation rec { name = "kile-${version}"; - version = "2016-07-25"; + version = "2016-10-24"; src = fetchgit { url = git://anongit.kde.org/kile.git; - rev = "9cad4757df2493a6099b89114340493c6b436d0b"; - sha256 = "0kikrkssfd7bj580iwsipirbz2klxvk0f7nfg5y9mkv0pnchx2mj"; + rev = "e005e2ac140881aa7610bd363d181cf306f91f80"; + sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4"; }; From e1939ed0568b11eba481121e10f9162e0a43acfd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 2 Nov 2016 10:38:19 +0100 Subject: [PATCH 070/336] konversation: 1.6.1 -> 1.6.2 --- pkgs/applications/networking/irc/konversation/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix index 995eddd9321..c6876405462 100644 --- a/pkgs/applications/networking/irc/konversation/1.6.nix +++ b/pkgs/applications/networking/irc/konversation/1.6.nix @@ -30,13 +30,13 @@ let unwrapped = let pname = "konversation"; - version = "1.6.1"; + version = "1.6.2"; in kdeDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "28346d6629261a5328c43ffa09c12e37743b3ef4f4bc4c411d39bc19f7bf06c6"; + sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; }; buildInputs = [ From 68f2bc8fb351065fda55c8a7b1ee6d74ba64a9a0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 2 Nov 2016 11:48:06 +0100 Subject: [PATCH 071/336] perl-Image-Info: 1.38 -> 1.39 Fixes information disclosure security issue. See https://lwn.net/Vulnerabilities/704702/. --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b5824b2e05a..1f49ba5d645 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6453,10 +6453,10 @@ let self = _self // overrides; _self = with self; { if_ = self."if"; ImageInfo = buildPerlPackage rec { - name = "Image-Info-1.38"; + name = "Image-Info-1.39"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; - sha256 = "b8a68b5661555feaf767956fe9ff14c917a63bedb3e30454d5598d992eb7e919"; + sha256 = "af155264667a2c22e3e2225195b8f6589329f9567e1789b7ce439ee21178713d"; }; propagatedBuildInputs = [ IOstringy ]; meta = { From cd67a0aada863e1510c0573aed03b20959dfdebb Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 2 Nov 2016 06:42:01 -0400 Subject: [PATCH 072/336] tre: add patch for CVE-2016-8859 --- pkgs/development/libraries/tre/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 5700a7d144e..25d7849b1b4 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { name = "tre-0.8.0"; @@ -7,6 +7,13 @@ stdenv.mkDerivation rec { sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; + patches = [ + (fetchpatch { + url = https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859; + sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; + }) + ]; + meta = { platforms = stdenv.lib.platforms.unix; }; From 22b74e35350da40ab23ef2564534ac9958c93306 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 19:48:10 +0100 Subject: [PATCH 073/336] qjackctl: 0.4.2 -> 0.4.3 --- pkgs/applications/audio/qjackctl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index db73901d2aa..c84e5cdfb49 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g"; + sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb"; }; - buildInputs = [ + buildInputs = [ qt5.full qt5.qtx11extras - alsaLib + alsaLib libjack2 - dbus + dbus ]; configureFlags = "--enable-jack-version"; From d315ca408065cd86d554648c75b323ead8f7c175 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 19:48:54 +0100 Subject: [PATCH 074/336] libjack2-git: 2015-09-03 -> 2016-08-18 --- pkgs/development/libraries/libsoundio/default.nix | 4 ++-- pkgs/misc/jackaudio/{git.nix => unstable.git} | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/misc/jackaudio/{git.nix => unstable.git} (86%) diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index a35ab14e253..788a5db13cd 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; - buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ]; + buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ]; meta = with stdenv.lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/unstable.git similarity index 86% rename from pkgs/misc/jackaudio/git.nix rename to pkgs/misc/jackaudio/unstable.git index ac50b4c3d39..1f8a41da32f 100644 --- a/pkgs/misc/jackaudio/git.nix +++ b/pkgs/misc/jackaudio/unstable.git @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, readline, eigen, celt # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -23,21 +23,21 @@ let optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { - name = "${prefix}jack2-${version}"; - version = "2015-09-03"; + name = "${prefix}jack2-unstable-${version}"; + version = "2016-08-18"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; - rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c"; - sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1"; + rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46"; + sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; buildInputs = [ python - libsamplerate libsndfile readline + libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f72a57f9bb1..4605b2010d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7077,7 +7077,7 @@ in #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr/default.nix { }; - + mpfi = callPackage ../development/libraries/mpfi { }; # A GMP fork @@ -16994,7 +16994,7 @@ in libopus = libopus.override { withCustomModes = true; }; }; libjack2 = jack2Full.override { prefix = "lib"; }; - libjack2-git = callPackage ../misc/jackaudio/git.nix { }; + libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { }; keynav = callPackage ../tools/X11/keynav { }; From 248bf519c9b29a93684d5bb900046d5d0ef1d26e Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Wed, 2 Nov 2016 10:55:39 +0100 Subject: [PATCH 075/336] smokeping service: Fix permissions in $smokepingHome In the prestart config of the smokeping service, smokeping is executed initially. This happens as the user root and writes some files to $smokepingHome, which can't be overwritten by the smokeping user. This gives an error message. I fixed this by moving the chown step after the initial smokeping runs, so that it also affects the generated files. --- nixos/modules/services/networking/smokeping.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 0c1f8d8cdb9..6084dbdbf78 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -284,10 +284,10 @@ in mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${smokepingHome}/cropper ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper - chown -R ${cfg.user} ${smokepingHome} cp ${cgiHome} ${smokepingHome}/smokeping.fcgi ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} + chown -R ${cfg.user} ${smokepingHome} ''; script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; }; From 4396ee953611b300f229ec33c05442769b19cf73 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 14:43:16 +0100 Subject: [PATCH 076/336] fmsynth: init at 2015-02-07 --- pkgs/applications/audio/fmsynth/default.nix | 48 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/fmsynth/default.nix diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix new file mode 100644 index 00000000000..22944ffefe4 --- /dev/null +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +stdenv.mkDerivation rec { + name = "fmsynth-unstable-${version}"; + version = "2015-02-07"; + src = fetchFromGitHub { + owner = "Themaister"; + repo = "libfmsynth"; + rev = "9ffa1d2fea287f1209b210d2dbde2f0f60f37176"; + sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; + }; + + buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ]; + + buildPhase = '' + cd lv2 + substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2" + make + ''; + + preInstall = "mkdir -p $out/lib/lv2"; + + meta = { + description = "a flexible 8 operator FM synthesizer for LV2"; + longDescription = '' + The synth core supports: + + - Arbitrary amounts of polyphony + - 8 operators + - No fixed "algorithms" + - Arbitrary modulation, every operator can modulate any other operator, even itself + - Arbitrary carrier selection, every operator can be a carrier + - Sine LFO, separate LFO per voice, modulates amplitude and frequency of operators + - Envelope per operator + - Carrier stereo panning + - Velocity sensitivity per operator + - Mod wheel sensitivity per operator + - Pitch bend + - Keyboard scaling + - Sustain, sustained keys can overlap each other for a very rich sound + - Full floating point implementation optimized for SIMD + - Hard real-time constraints + ''; + homepage = https://github.com/Themaister/libfmsynth; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 262e4e058b3..64257f56b5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7072,7 +7072,7 @@ in #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr/default.nix { }; - + mpfi = callPackage ../development/libraries/mpfi { }; # A GMP fork @@ -12770,6 +12770,8 @@ in fmit = qt5.callPackage ../applications/audio/fmit { }; + fmsynth = callPackage ../applications/audio/fmsynth { }; + focuswriter = callPackage ../applications/editors/focuswriter { }; font-manager = callPackage ../applications/misc/font-manager { }; From efcfcfc789bd0c11ceb177777bc65065f4aab66b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 16:26:36 +0100 Subject: [PATCH 077/336] ladspaPlugins: 0.4.15 -> 0.4.17 --- .../audio/ladspa-plugins/default.nix | 33 +++++++++++-------- .../applications/audio/ladspa-plugins/git.nix | 28 ---------------- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/audio/ladspa-plugins/git.nix diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index b563c850d52..1b68caccf4e 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +, perlPackages }: + +stdenv.mkDerivation rec { + name = "swh-plugins-${version}"; + version = "0.4.17"; -stdenv.mkDerivation { - name = "swh-plugins-0.4.15"; src = fetchurl { - url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz; - sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh"; + url = "https://github.com/swh/ladspa/archive/v${version}.tar.gz"; + sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - - buildInputs = [fftw ladspaH pkgconfig]; - postInstall = - '' - mkdir -p $out/share/ladspa/ - ln -sv $out/lib/ladspa $out/share/ladspa/lib - ''; + buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ]; - meta = { + patchPhase = '' + patchShebangs . + patchShebangs ./metadata/ + cp ${automake}/share/automake-*/mkinstalldirs . + ''; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk/; description = "LADSPA format audio plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix deleted file mode 100644 index ef34eb91600..00000000000 --- a/pkgs/applications/audio/ladspa-plugins/git.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig -, perl, perlPackages }: - -stdenv.mkDerivation { - name = "swh-plugins-git-2015-03-04"; - - src = fetchgit { - url = https://github.com/swh/ladspa.git; - rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686"; - sha256 = "1rmqm4780dhp0pj2scl3k7m8hpp1x6w6ln4wwg954zb9570rqaxx"; - }; - - buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; - - patchPhase = '' - patchShebangs . - patchShebangs ./metadata/ - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - meta = with stdenv.lib; { - homepage = http://plugin.org.uk/; - description = "LADSPA format audio plugins"; - license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 262e4e058b3..d978cb1ab16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13455,10 +13455,6 @@ in fftw = fftwSinglePrec; }; - ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix { - fftw = fftwSinglePrec; - }; - ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; caps = callPackage ../applications/audio/caps { }; From ab0ac18279d6497bdeb616cbe7cd0797d6534739 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 2 Nov 2016 14:20:58 +0100 Subject: [PATCH 078/336] libjack2Unstable: fix evaluation broken by f64933596c58329d59eae7485f4868b53955fc3a --- pkgs/misc/jackaudio/unstable.nix | 79 ++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/misc/jackaudio/unstable.nix diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix new file mode 100644 index 00000000000..1f8a41da32f --- /dev/null +++ b/pkgs/misc/jackaudio/unstable.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper +, bash, libsamplerate, libsndfile, readline, eigen, celt + +# Optional Dependencies +, dbus ? null, libffado ? null, alsaLib ? null +, libopus ? null + +# Extra options +, prefix ? "" +}: + +with stdenv.lib; +let + inherit (python2Packages) python dbus-python; + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + libOnly = prefix == "lib"; + + optDbus = shouldUsePkg dbus; + optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; + optLibffado = if libOnly then null else shouldUsePkg libffado; + optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; + optLibopus = shouldUsePkg libopus; +in +stdenv.mkDerivation rec { + name = "${prefix}jack2-unstable-${version}"; + version = "2016-08-18"; + + src = fetchFromGitHub { + owner = "jackaudio"; + repo = "jack2"; + rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46"; + sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j"; + }; + + nativeBuildInputs = [ pkgconfig python makeWrapper ]; + buildInputs = [ + python + + libsamplerate libsndfile readline eigen celt + + optDbus optPythonDBus optLibffado optAlsaLib optLibopus + ]; + + patchPhase = '' + substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash + ''; + + configurePhase = '' + python waf configure --prefix=$out \ + ${optionalString (optDbus != null) "--dbus"} \ + --classic \ + --profile \ + ${optionalString (optLibffado != null) "--firewire"} \ + ${optionalString (optAlsaLib != null) "--alsa"} \ + --autostart=${if (optDbus != null) then "dbus" else "classic"} \ + ''; + + buildPhase = '' + python waf build + ''; + + installPhase = '' + python waf install + '' + (if libOnly then '' + rm -rf $out/{bin,share} + rm -rf $out/lib/{jack,libjacknet*,libjackserver*} + '' else '' + wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH + ''); + + meta = { + description = "JACK audio connection kit, version 2 with jackdbus"; + homepage = "http://jackaudio.org"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ goibhniu wkennington ]; + }; +} From 6ad14d42569ffbf214ee301aaa9f47370bc5555d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 13:47:53 +0100 Subject: [PATCH 079/336] pythonPackages.django_1_10: 1.10.2 -> 1.10.3 Fixes CVE-2016-9013, CVE-2016-9014. https://www.djangoproject.com/weblog/2016/nov/01/security-releases/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 286eb22aa32..42e733268ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9654,12 +9654,12 @@ in { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10.2"; + version = "1.10.3"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "1qdwgkwlq5wl0wn247d9gid49xpz4qggk0lcdqxq8d7v1cmg29z1"; + sha256 = "0c4c8zs7kzb0bdlpy4vlzv6va26dbazr32h91rldf6waxs6z14kg"; }; patches = [ From 58ad105cd43356e3de024fbf7df2d34f10d696df Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 13:55:38 +0100 Subject: [PATCH 080/336] pythonPackages.django_1_9: 1.9.10 -> 1.9.11 Fixes CVE-2016-9013, CVE-2016-9014. https://www.djangoproject.com/weblog/2016/nov/01/security-releases/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42e733268ec..bf24ce3618c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9686,12 +9686,12 @@ in { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.10"; + version = "1.9.11"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "007w2pshbk1s6gfgp8717fwz01l8mcmd2lkxdgqqgd11bag7qfjv"; + sha256 = "17bxmfp92bdwjachjqb5zdlay5fhv4125hc85ln4ggyz0f5zvp6s"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) From b806e14a3ced762ec2b0ce162c75d400f312e897 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 13:56:00 +0100 Subject: [PATCH 081/336] pythonPackages.django_1_8: 1.8.15 -> 1.8.16 Fixes CVE-2016-9013, CVE-2016-9014. https://www.djangoproject.com/weblog/2016/nov/01/security-releases/ --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf24ce3618c..671e7e798a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9710,12 +9710,12 @@ in { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.15"; + version = "1.8.16"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1kga849ixd6sz6svhv8dysyjr03wphqgl4wjw2yczmc5r4x58gl6"; + sha256 = "1pc1j3q64v65c573xwx64apjnf2v19nzxsidjiyp02c6l8bsyji2"; }; # too complicated to setup From 84174c0cb8b9fdc40ef5390ad07c4f1633db38ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 2 Nov 2016 14:54:25 +0100 Subject: [PATCH 082/336] libjack2Unstable: and remove the old file that I forgot to stage. --- pkgs/misc/jackaudio/unstable.git | 79 -------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 pkgs/misc/jackaudio/unstable.git diff --git a/pkgs/misc/jackaudio/unstable.git b/pkgs/misc/jackaudio/unstable.git deleted file mode 100644 index 1f8a41da32f..00000000000 --- a/pkgs/misc/jackaudio/unstable.git +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, eigen, celt - -# Optional Dependencies -, dbus ? null, libffado ? null, alsaLib ? null -, libopus ? null - -# Extra options -, prefix ? "" -}: - -with stdenv.lib; -let - inherit (python2Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; - - libOnly = prefix == "lib"; - - optDbus = shouldUsePkg dbus; - optPythonDBus = if libOnly then null else shouldUsePkg dbus-python; - optLibffado = if libOnly then null else shouldUsePkg libffado; - optAlsaLib = if libOnly then null else shouldUsePkg alsaLib; - optLibopus = shouldUsePkg libopus; -in -stdenv.mkDerivation rec { - name = "${prefix}jack2-unstable-${version}"; - version = "2016-08-18"; - - src = fetchFromGitHub { - owner = "jackaudio"; - repo = "jack2"; - rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46"; - sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j"; - }; - - nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ - python - - libsamplerate libsndfile readline eigen celt - - optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ]; - - patchPhase = '' - substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash - ''; - - configurePhase = '' - python waf configure --prefix=$out \ - ${optionalString (optDbus != null) "--dbus"} \ - --classic \ - --profile \ - ${optionalString (optLibffado != null) "--firewire"} \ - ${optionalString (optAlsaLib != null) "--alsa"} \ - --autostart=${if (optDbus != null) then "dbus" else "classic"} \ - ''; - - buildPhase = '' - python waf build - ''; - - installPhase = '' - python waf install - '' + (if libOnly then '' - rm -rf $out/{bin,share} - rm -rf $out/lib/{jack,libjacknet*,libjackserver*} - '' else '' - wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH - ''); - - meta = { - description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = "http://jackaudio.org"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ goibhniu wkennington ]; - }; -} From accd0728d84f699f96d06b3c4000b77c8dc4f504 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Wed, 2 Nov 2016 22:36:02 +0800 Subject: [PATCH 083/336] haskellPackages.tinc: 20160924 -> 20161102 --- pkgs/development/tools/haskell/tinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 81a3a20381e..82d6492ce18 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20160924"; + version = "20161102"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "f5ba99264930a2af2f24770a23af2613acdac631"; - sha256 = "19mvswpjak9dxpd4w86fz1wv0zkn6ippc37gdkhyg4xcj9jn21a9"; + rev = "411d0f319717d01dc71bd5c1faef8035656eaf3d"; + sha256 = "040vyg9n7ihnqs6fyhhr5p4xscfxhji02wsfw4nncpxflzaciji5"; }; isLibrary = false; isExecutable = true; From 9f4114a7402cd1a761b8b6a267c7cb1641668002 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Sat, 29 Oct 2016 20:37:59 +0100 Subject: [PATCH 084/336] samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups' This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238 Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices. All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from https://github.com/jokogr/nixpkgs/commit/c41e771a388dca6cb5f15edab2fd36fd6f96c8a8 --- pkgs/misc/cups/drivers/samsung/default.nix | 69 +++++++++++++--------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 5f870bf9217..8ef788df66f 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, cups, libusb, libxml2 }: +{ stdenv, fetchurl, glibc, cups, libusb, ghostscript }: let @@ -15,45 +15,33 @@ in stdenv.mkDerivation rec { url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; }; - nativeBuildInputs = [ patchelf ]; + buildInputs = [ + cups + libusb + ]; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' - my_patchelf() { - opts=(); while [[ "$1" != - ]]; do opts+=( "$1" ); shift; done; shift - for binary in "$@"; do - echo "Patching ELF file: $binary" - patchelf "''${opts[@]}" $binary - ldd $binary | grep "not found" && exit 1 - done; true - } - my_patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${cups.out}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \ - - ${arch}/{pstosecps,rastertospl,smfpnetdiscovery} + mkdir -p $out/bin + cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin mkdir -p $out/etc/sane.d/dll.d/ install -m644 noarch/etc/smfp.conf $out/etc/sane.d - echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner + echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf mkdir -p $out/lib - my_patchelf \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \ - - ${arch}/libscmssc.so* install -m755 ${arch}/libscmssc.so* $out/lib mkdir -p $out/lib/cups/backend - install -m755 ${arch}/smfpnetdiscovery $out/lib/cups/backend + ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend mkdir -p $out/lib/cups/filter - install -m755 ${arch}/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $ghostscript/bin/gs $out/lib/cups/filter mkdir -p $out/lib/sane - my_patchelf \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.lib.makeLibraryPath [ stdenv.glibc libusb libxml2 ] } \ - - ${arch}/libsane-smfp.so* install -m755 ${arch}/libsane-smfp.so* $out/lib/sane ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1 ln -s libsane-smfp.so.1 $out/lib/sane/libsane-smfp.so @@ -66,16 +54,39 @@ in stdenv.mkDerivation rec { . noarch/package_utils . noarch/scanner-script.pkg fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules + chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules ) - mkdir -p $out/share/ppd - gzip -9 noarch/share/ppd/*.ppd - cp -R noarch/share/ppd $out/share/ppd/suld - - cp -R noarch/share/locale $out/share + mkdir -p $out/share + cp -R noarch/share/* $out/share + gzip -9 $out/share/ppd/*.ppd rm -r $out/share/locale/*/*/install.mo + + mkdir -p $out/share/cups + cd $out/share/cups + ln -s ../ppd . + ln -s ppd model ''; + preFixup = '' + + for bin in $out/bin/*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${cups.out}/lib" "$bin" + done + + patchelf --set-rpath "$out/lib:${cups.out}/lib" "$out/lib/libscmssc.so" + + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = http://www.bchemnet.com/suldr; From 18375a7331dbaeb9a7a8aa0b505454bafd31f57b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 2 Nov 2016 16:17:48 +0100 Subject: [PATCH 085/336] Revert "python: adding a back python27Full" This reverts commit 822f480922fe2a0a38bc9de429cb2457b2eda96f. See here for more discussion: https://github.com/NixOS/nixpkgs/commit/822f480922fe2a0a38bc9de429cb2457b2eda96f --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88ab02d027c..a3c86782db7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5516,7 +5516,6 @@ in pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; - python27Full = python2Full; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python2Packages; From 5c197b2e38563c368a5e6945fdba27aa8dd5baed Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 2 Nov 2016 16:22:29 +0100 Subject: [PATCH 086/336] haskellPackages: mark sindre broken --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e957f90953f..627b0261ce9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1051,4 +1051,7 @@ self: super: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); + # horribly outdated (X11 interface changed a lot) + sindre = markBroken super.sindre; + } From 8bae051c72d70f9ebd53335615d326349dcfd424 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 2 Nov 2016 16:29:03 +0100 Subject: [PATCH 087/336] solc: 0.4.2 -> 0.4.4 --- pkgs/development/compilers/solc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 40d7ef06432..928de23f04b 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, boost, cmake, jsoncpp }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.4"; name = "solc-${version}"; src = fetchFromGitHub { owner = "ethereum"; repo = "solidity"; rev = "v${version}"; - sha256 = "1d5x3psz8a9z9jnm30aspfvrpd9kblr14cn5vyl21p27x2vdlzr4"; + sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z"; }; patchPhase = '' - echo >commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3 + echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61 ''; buildInputs = [ boost cmake jsoncpp ]; From a890d1765b628efd675cbfb0568eb5d479659578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Nov 2016 17:32:39 +0100 Subject: [PATCH 088/336] zotero: mark as broken #20049 --- pkgs/applications/office/zotero/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1e4ed37e93d..0e9f2eba1d1 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation { description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; platforms = platforms.linux; + broken = true; # probably; see #20049 }; } From a5dad8aeeb3bc006646e736ae36277a610b5ed22 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Wed, 2 Nov 2016 17:46:01 +0100 Subject: [PATCH 089/336] nodejs: refactor derivations (#19973) * refactor and clean up the derivation composition * add slim variation: the slim variations configure node without npm. Building node with npm introduces a python runtime depndency through gyp - slim variation makes sense for building small nodejs production images --- pkgs/development/web/nodejs/nodejs.nix | 96 +++++++++++++------------- pkgs/development/web/nodejs/v4.nix | 27 ++++---- pkgs/development/web/nodejs/v6.nix | 37 +++++----- pkgs/top-level/all-packages.nix | 16 ++++- 4 files changed, 96 insertions(+), 80 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7c92df30311..236688bd463 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,67 +1,65 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -, version -, sha256 ? null -, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; } -, preBuild ? "" -, extraConfigFlags ? [] -, extraBuildInputs ? [] -, patches ? [], - ... +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true }: -assert stdenv.system != "armv5tel-linux"; +with stdenv.lib; let - deps = { - inherit openssl zlib libuv; - } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { - inherit http-parser; - }); + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - sharedConfigureFlags = name: [ + sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; }); + + sharedConfigureFlags = concatMap (name: [ "--shared-${name}" - "--shared-${name}-includes=${builtins.getAttr name deps}/include" - "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" - ]; + "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" + ]) (builtins.attrNames sharedLibDeps); - inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; +in -in stdenv.mkDerivation { + rec { - inherit version src preBuild; - - name = "nodejs-${version}"; - - configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags; - dontDisableStatic = true; - prePatch = '' - patchShebangs . - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py - ''; - - postInstall = '' - PATH=$out/bin:$PATH patchShebangs $out - ''; - - patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - - buildInputs = extraBuildInputs + buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ python2 which zlib libuv openssl ] ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig libtool ]; - setupHook = ./setup-hook.sh; - enableParallelBuilding = true; + configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; - passthru.interpreterName = "nodejs"; + dontDisableStatic = true; - meta = { - description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; - license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan maintainers.cko ]; - platforms = platforms.linux ++ platforms.darwin; - }; + enableParallelBuilding = true; + + passthru.interpreterName = "nodejs"; + + + setupHook = ./setup-hook.sh; + + patches = optionals stdenv.isDarwin [ ./no-xcode.patch ]; + + preBuild = optionalString stdenv.isDarwin '' + sed -i -e "s|tr1/type_traits|type_traits|g" \ + -e "s|std::tr1|std|" src/util.h + ''; + + prePatch = '' + patchShebangs . + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py + ''; + + postInstall = '' + PATH=$out/bin:$PATH patchShebangs $out + ''; + + meta = { + description = "Event-driven I/O framework for the V8 JavaScript engine"; + homepage = http://nodejs.org; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + platforms = platforms.linux ++ platforms.darwin; + }; } diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index f0a505a683a..04ea7086f74 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool +, pkgconfig, runCommand, which, libtool, fetchpatch , callPackage +, darwin ? null +, enableNpm ? true }@args: -import ./nodejs.nix (args // rec { - version = "4.6.0"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; - }; +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "4.6.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; + }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/util.h \ - --replace "tr1/type_traits" "type_traits" - ''; -}) + }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index a2213546ec4..50bd2cb672e 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -2,24 +2,27 @@ , pkgconfig, runCommand, which, libtool, fetchpatch , callPackage , darwin ? null +, enableNpm ? true }@args: let - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "6.8.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; + }; + + patches = nodejs.patches ++ [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; + + }) -in import ./nodejs.nix (args // rec { - version = "6.8.0"; - sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; - extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin - [ CoreServices ApplicationServices ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e "s|tr1/type_traits|type_traits|g" \ - -e "s|std::tr1|std|" src/util.h - ''; - patches = [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3c86782db7..4e0efdfe5a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2426,15 +2426,27 @@ in ninka = callPackage ../development/tools/misc/ninka { }; + nodejs = nodejs-6_x; + + nodejs-slim = nodejs-slim-6_x; + nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; }; + nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodejs-6_x = callPackage ../development/web/nodejs/v6.nix { libtool = darwin.cctools; }; - nodejs = nodejs-6_x; + nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { + libtool = darwin.cctools; + enableNpm = false; + }; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; @@ -2444,7 +2456,7 @@ in nodejs = pkgs.nodejs-4_x; }; - nodePackages = nodePackages_4_x; + nodePackages = nodePackages_6_x; # Can be used as a user shell nologin = shadow; From 7f805a60d89f8a92050cb035f4c85bb2a441a5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Nov 2016 17:49:19 +0100 Subject: [PATCH 090/336] nodejs: put back a comment about closure size --- pkgs/development/web/nodejs/nodejs.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 236688bd463..a45a95680b1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -16,6 +16,10 @@ let sharedConfigureFlags = concatMap (name: [ "--shared-${name}" "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" + /** Closure notes: we explicitly avoid specifying --shared-*-includes, + * as that would put the paths into bin/nodejs. + * Including pkgconfig in build inputs would also have the same effect! + */ ]) (builtins.attrNames sharedLibDeps); extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; From 1b78ae4b6a172f8deed17b4a95ea1625cfb35e97 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Wed, 2 Nov 2016 18:20:03 +0100 Subject: [PATCH 091/336] Add npm2nix to v6.x nodePackages --- pkgs/development/node-packages/default-v6.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 12fbaced770..8e6aeac9683 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -29,10 +29,14 @@ nodePackages // { sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; }} $TMPDIR/webdrvr/chromedriver_linux64.zip ''; - + dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + bower2nix = nodePackages.bower2nix.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' From 6f17cb108d8ea95e673734282be508d4cf8a6ee6 Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Tue, 1 Nov 2016 21:16:23 +0100 Subject: [PATCH 092/336] bear: 2.2.0 -> 2.2.1 Taken from #20020. --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index cc34a73ecd5..0f0ee597920 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "08llfqg8y6d7vfwaw5plrk1rrqzs0ywi2ldnlwvy917603971rg0"; + sha256 = "1rwar5nvvhfqws4nwyifaysqs3nxpphp48lx9mdg5n6l4z7drz0n"; }; nativeBuildInputs = [ cmake ]; From da68cc24f087176c576cb7ff0e05faeb4ea7672f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Oct 2016 20:58:52 +0200 Subject: [PATCH 093/336] coq: 8.5pl2 -> 8.5pl3 --- pkgs/applications/science/logic/coq/8.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index eb74891f511..91266553c93 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -6,7 +6,7 @@ {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: let - version = "8.5pl2"; + version = "8.5pl3"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; + sha256 = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace configure.ml --replace "if arch = \"Darwin\" || arch = \"FreeBSD\" then \"md5" "if arch = \"Darwinx\" then \"md5" + substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"' ${csdpPatch} ''; From b840da02cd91a67010826a9f375a02d71eaa7254 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Oct 2016 21:09:59 +0200 Subject: [PATCH 094/336] coq: build and install the votour utility --- pkgs/applications/science/logic/coq/8.5.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index 91266553c93..9512e27080f 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -57,7 +57,11 @@ stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = "revision coq coqide"; + buildFlags = "revision coq coqide bin/votour"; + + postInstall = '' + cp bin/votour $out/bin/ + ''; meta = with stdenv.lib; { description = "Coq proof assistant"; From 7c53518663658db36218fa8f5566442d3f71da99 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 31 Oct 2016 19:10:30 +0100 Subject: [PATCH 095/336] compcert: patch to build with Coq-8.5pl3 --- pkgs/development/compilers/compcert/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index fb95372a96f..f5554ee0ce3 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' + substituteInPlace ./configure --replace pl2 pl3 substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); From 5f49eeb935112e69f8992083ca173728a90cbf8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 31 Oct 2016 19:10:39 +0100 Subject: [PATCH 096/336] coq: move out of ocamlPackages --- pkgs/top-level/all-packages.nix | 22 ++++++++++++++++++---- pkgs/top-level/ocaml-packages.nix | 20 +------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e0efdfe5a5..3ac37ea3969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16470,13 +16470,27 @@ in aspino = callPackage ../applications/science/logic/aspino {}; - inherit (ocaml-ng.ocamlPackages_4_01_0) coq; + coq = callPackage ../applications/science/logic/coq { + inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; + camlp5 = ocamlPackages_4_01_0.camlp5_transitional; + }; - inherit (ocamlPackages) coq_HEAD; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; - inherit (ocamlPackages) coq_8_5; + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { + inherit (ocamlPackages) ocaml findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; - inherit (ocaml-ng.ocamlPackages_3_12_1) coq_8_3; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + make = pkgs.gnumake3; + inherit (ocamlPackages_3_12_1) ocaml findlib; + camlp5 = ocamlPackages_3_12_1.camlp5_transitional; + lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; + }; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 58e9512e31c..d4ca17f6dbd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -612,7 +612,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ) // { - coq = coq_8_5; + coq = pkgs.coq_8_5; }); haxe = callPackage ../development/compilers/haxe { }; @@ -654,24 +654,6 @@ let enableX11 = config.unison.enableX11 or true; }; - coq = callPackage ../applications/science/logic/coq { - camlp5 = camlp5_transitional; - }; - - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { - camlp5 = camlp5_transitional; - }; - - coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { - camlp5 = camlp5_transitional; - }; - - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = pkgs.gnumake3; - camlp5 = camlp5_transitional; - lablgtk = lablgtk_2_14; - }; - hol_light = callPackage ../applications/science/logic/hol_light { camlp5 = camlp5_strict; }; From 66a25908debec9e306bdea3f07a1ff8a01012822 Mon Sep 17 00:00:00 2001 From: rbasso Date: Thu, 3 Nov 2016 02:59:56 +0900 Subject: [PATCH 097/336] maintainers: add rbasso --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6ff64599540..5a5d58e6f96 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -360,6 +360,7 @@ rardiol = "Ricardo Ardissone "; rasendubi = "Alexey Shmalko "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; + rbasso = "Rafael Basso "; redbaron = "Maxim Ivanov "; redvers = "Redvers Davies "; refnil = "Martin Lavoie "; From fa46c22354a4461c9fab41b28ac427ec21c14c71 Mon Sep 17 00:00:00 2001 From: rbasso Date: Thu, 3 Nov 2016 03:01:17 +0900 Subject: [PATCH 098/336] exercism: init at 2.3.0 --- pkgs/applications/misc/exercism/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/exercism/default.nix diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix new file mode 100644 index 00000000000..6ccae9d5360 --- /dev/null +++ b/pkgs/applications/misc/exercism/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "exercism-${version}"; + version = "2.3.0"; + + goPackagePath = "github.com/exercism/cli"; + + src = fetchFromGitHub { + owner = "exercism"; + repo = "cli"; + rev = "v${version}"; + sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5"; + }; + + meta = with stdenv.lib; { + description = "A Go based command line tool for exercism.io"; + homepage = http://exercism.io/cli; + license = licenses.mit; + maintainers = [ maintainers.rbasso ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e0efdfe5a5..0e0e04909f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12749,6 +12749,8 @@ in evopedia = callPackage ../applications/misc/evopedia { }; + exercism = callPackage ../applications/misc/exercism { }; + gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; keepassx = callPackage ../applications/misc/keepassx { }; From b028b5f4ef03d6c3dae4cdda898c1996348c4e18 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 2 Nov 2016 19:39:22 +0100 Subject: [PATCH 099/336] coq-8.5: ease the selection of an older (patch level) version --- pkgs/applications/science/logic/coq/8.5.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index 9512e27080f..aae2101f50e 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -2,11 +2,22 @@ # - The csdp program used for the Micromega tactic is statically referenced. # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. +# - The patch-level version can be specified through the `pl` argument to +# the derivation; it defaults to the greatest. -{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: +{ stdenv, fetchurl, writeText, pkgconfig +, ocaml, findlib, camlp5, ncurses +, lablgtk ? null, csdp ? null +, pl ? "3" +}: let - version = "8.5pl3"; + version = "8.5pl${pl}"; + sha256 = { + "1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; + "2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; + "3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; + }."${pl}"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -24,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; + inherit sha256; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; From 64a3317889e18776ac6ad97a7723d795e10a94ed Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Wed, 2 Nov 2016 20:30:31 +0100 Subject: [PATCH 100/336] youtube-dl: 2016-10-31 -> 2016-11-02 (#20103) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3710eef238f..8f1ac7546bb 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.10.31"; + version = "2016.11.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4"; + sha256 = "97777924c3df763d3f2259c9a7f227a01e787ccd452be198191a4a848a7632d7"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From a113382f2c8557ede623e392be6a294b8a6aa545 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 2 Nov 2016 16:39:18 -0400 Subject: [PATCH 101/336] top-level: Use `nixpkgsFun` to avoid import ../.. --- pkgs/top-level/all-packages.nix | 8 +++----- pkgs/top-level/default.nix | 18 ++++++++++++++---- pkgs/top-level/stdenv.nix | 13 ++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e0efdfe5a5..fc4660108d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6,6 +6,7 @@ * Hint: ### starts category names. */ { system, bootStdenv, noSysDirs, config, crossSystem, platform, lib +, nixpkgsFun , ... }: self: pkgs: @@ -35,10 +36,9 @@ in newScope = extra: lib.callPackageWith (defaultScope // extra); # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: (import ../..) { + forceSystem = system: kernel: nixpkgsFun { inherit system; platform = platform // { kernelArch = kernel; }; - inherit bootStdenv noSysDirs config crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... @@ -4254,9 +4254,7 @@ in # load into the Ben Nanonote gccCross = let - pkgsCross = (import ../..) { - inherit system; - inherit bootStdenv noSysDirs config; + pkgsCross = nixpkgsFun { # Ben Nanonote system crossSystem = { config = "mipsel-unknown-linux"; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index c54b23853c5..7d370bec6b5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -24,13 +24,12 @@ , crossSystem ? null , platform ? null -}: +} @ args: let configExpr = config; platform_ = platform; in # rename the function arguments let - lib = import ../../lib; # Allow both: @@ -58,9 +57,20 @@ let else config.platform or platformAuto; topLevelArguments = { - inherit system bootStdenv noSysDirs config crossSystem platform lib; + inherit system bootStdenv noSysDirs config crossSystem platform lib nixpkgsFun; }; + # A few packages make a new package set to draw their dependencies from. + # (Currently to get a cross tool chain, or forced-i686 package.) Rather than + # give `all-packages.nix` all the arguments to this function, even ones that + # don't concern it, we give it this function to "re-call" nixpkgs, inheriting + # whatever arguments it doesn't explicitly provide. This way, + # `all-packages.nix` doesn't know more than it needs too. + # + # It's OK that `args` doesn't include the defaults: they'll be + # deterministically inferred the same way. + nixpkgsFun = newArgs: import ./. (args // newArgs); + stdenvAdapters = self: super: let res = import ../stdenv/adapters.nix self; in res // { stdenvAdapters = res; @@ -71,7 +81,7 @@ let inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }); - stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs; + stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) pkgs; allPackages = self: super: let res = import ./all-packages.nix topLevelArguments res self; diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 9b8cf5a0309..c36b0fed091 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,12 +1,11 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, ... }: -self: super: - -with super; +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, ... }: +pkgs: rec { allStdenvs = import ../stdenv { inherit system platform config lib; - allPackages = args: import ../.. ({ inherit config system; } // args); + # TODO(@Ericson2314): hack for cross-compiling until I clean that in follow-up PR + allPackages = args: nixpkgsFun (args // { crossSystem = null; }); }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; @@ -14,14 +13,14 @@ rec { stdenv = if bootStdenv != null then (bootStdenv // {inherit platform;}) else if crossSystem != null then - stdenvCross + pkgs.stdenvCross else let changer = config.replaceStdenv or null; in if changer != null then changer { # We import again all-packages to avoid recursivities. - pkgs = import ../.. { + pkgs = nixpkgsFun { # We remove packageOverrides to avoid recursivities config = removeAttrs config [ "replaceStdenv" ]; }; From 2f8ac21e1bdf4f94730a9ed5774bef9542ae523d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 2 Nov 2016 22:44:36 +0100 Subject: [PATCH 102/336] nixos: remove test-config-examples.sh (obsolete) This file has been non-functional for over two years, since commit f002a27a80 ("Remove obsolete directory") removed .../doc/config-examples/. --- nixos/tests/test-config-examples.sh | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 nixos/tests/test-config-examples.sh diff --git a/nixos/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh deleted file mode 100755 index 1ba2f841c41..00000000000 --- a/nixos/tests/test-config-examples.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# This script try to evaluate all configurations which are stored in -# doc/config-examples. This script is useful to ensure that examples are -# working with the current system. - -pwd=$(pwd) -set -xe -for i in ../doc/config-examples/*.nix; do - NIXOS_CONFIG="$pwd/$i" nix-instantiate \ - --eval-only --xml --strict > /dev/null 2>&1 \ - ../default.nix -A system -done -set +xe From bcb0a65f23a0d3ac1850ecd2b004e7c28b19a6d8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 2 Nov 2016 23:02:34 +0100 Subject: [PATCH 103/336] perl-Role-Tiny: 2.000003 -> 2.000005 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f49ba5d645..4068a0881d4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10971,10 +10971,10 @@ let self = _self // overrides; _self = with self; { }; RoleTiny = buildPerlPackage rec { - name = "Role-Tiny-2.000003"; + name = "Role-Tiny-2.000005"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "6e6c967e1154f290a40c9c60a762cc3b2ec5438107a4fbadddbe55a55b393434"; + sha256 = "593a29b621e029bf0218d0154d5dfdf6ec502afc49adeeadae6afd0c70063115"; }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; From f7e2675ed509bdd4da45c9d8bd19c5976111b16d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 2 Nov 2016 23:02:51 +0100 Subject: [PATCH 104/336] perl-Moo: 2.002003 -> 2.002005 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4068a0881d4..99e698f0771 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8471,10 +8471,10 @@ let self = _self // overrides; _self = with self; { }; Moo = buildPerlPackage rec { - name = "Moo-2.002003"; + name = "Moo-2.002005"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "a18f287d7ddda1e9862bc31c44394f42db077e2d9b93ca71785ccfacbc2f2bcd"; + sha256 = "8147f98a43f7beb808773202b05d3fba25d5fca018ad939d7e529f4d36d6dc68"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ]; From c9d27cc3ea6377b2e4b40110049a5e32e05a08ce Mon Sep 17 00:00:00 2001 From: Christine Koppelt Date: Thu, 3 Nov 2016 00:21:44 +0100 Subject: [PATCH 105/336] nodejs-7_x: init --- pkgs/development/web/nodejs/v7.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/web/nodejs/v7.nix diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix new file mode 100644 index 00000000000..420f2b0412f --- /dev/null +++ b/pkgs/development/web/nodejs/v7.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "7.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71"; + }; + + patches = nodejs.patches ++ [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; + + }) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc4660108d0..92d8e7594e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2448,6 +2448,15 @@ in enableNpm = false; }; + nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + enableNpm = false; + }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; }; From 76f742341cf440d2e890914b3c15b201916ba1da Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Nov 2016 10:38:57 +0900 Subject: [PATCH 106/336] qutebrowser: fix wrapper --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 3a62270afcf..af1256d3442 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -72,7 +72,6 @@ in buildPythonApplication rec { ''; postFixup = '' - wrapPythonPrograms mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser From 2b2f2733757922c0ea1fd2312662dc0442b59637 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 17:30:50 +0100 Subject: [PATCH 107/336] cairo: add patch to fix CVE-2016-9082 cc #20078 --- pkgs/development/libraries/cairo/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index fc3b060b35e..71aa1874951 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty -, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv +, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; }; + patches = [ + # from https://bugs.freedesktop.org/show_bug.cgi?id=98165 + (fetchpatch { + name = "cairo-CVE-2016-9082.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=127421"; + sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri"; + }) + ]; + prePatch = '' patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" ''; From 25c01931bb52bd2bc42b0bb017bd991236abd4fd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 20:29:52 +0100 Subject: [PATCH 108/336] qemu: add patches to fix lots of CVEs Patches from Debian and upstream git repo. Fixes: * CVE-2016-6836 * CVE-2016-7155 * CVE-2016-7156 * CVE-2016-7157 * CVE-2016-7421 * CVE-2016-7422 * CVE-2016-7423 * CVE-2016-7466 * CVE-2016-8909 * CVE-2016-8910 * CVE-2016-9102 * CVE-2016-9103 * CVE-2016-9104 * CVE-2016-9105 * CVE-2016-9106 cc #20078 --- .../virtualization/qemu/CVE-2016-9102.patch | 12 ++++ .../virtualization/qemu/default.nix | 71 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 pkgs/applications/virtualization/qemu/CVE-2016-9102.patch diff --git a/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch new file mode 100644 index 00000000000..05a95599937 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch @@ -0,0 +1,12 @@ +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index d938427..7557a7d 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -3261,6 +3261,7 @@ + xattr_fidp->fs.xattr.flags = flags; + v9fs_string_init(&xattr_fidp->fs.xattr.name); + v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name); ++ g_free(xattr_fidp->fs.xattr.value); + xattr_fidp->fs.xattr.value = g_malloc0(size); + err = offset; + put_fid(pdu, file_fidp); diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f1ee4426d97..f81781987cc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -47,6 +47,77 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch"; + sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch"; + sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch"; + sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch"; + sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch"; + sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch"; + sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch"; + sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch"; + sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch"; + sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8909.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050"; + sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8910.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225"; + sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9103.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d"; + sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9104.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6"; + sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9105.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c"; + sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9106.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9"; + sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z"; + }) + + # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html + + # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 + ./CVE-2016-9102.patch ]; hardeningDisable = [ "stackprotector" ]; From 04db88d2474431417ed3c9276f3078c69a125af6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 14:20:35 +0100 Subject: [PATCH 109/336] graphicsmagick: add patches to fix 3 CVEs Fixes CVE-2016-8682, CVE-2016-8683, CVE-2016-8684. cc #20078 --- .../applications/graphics/graphicsmagick/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 2e573e09b31..91f8e677adb 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -26,6 +26,18 @@ stdenv.mkDerivation { url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch"; sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch"; + sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch"; + sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; + sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; + }) ]; configureFlags = [ From 64902aebb0dbc839a3bfd52f65a024b4e7a77e6c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Nov 2016 20:43:24 +0100 Subject: [PATCH 110/336] libxml2: add patch to fix CVE-2016-4658 cc #20078 --- pkgs/development/libraries/libxml2/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 577006f9014..4831f150f45 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -12,6 +12,14 @@ in stdenv.mkDerivation rec { sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"; }; + patches = [ + (fetchpatch { + name = "CVE-2016-4658.patch"; + url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b"; + sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb"; + }) + ]; + # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5 postPatch = "patch -R < " + fetchpatch { name = "schemas-validity.patch"; From 3b42bfa77e11e4618523702601c948ac358a6748 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Nov 2016 12:58:30 +0900 Subject: [PATCH 111/336] groonga: 6.0.9 -> 6.1.0 (#20119) release notes: http://groonga.org/en/blog/2016/10/29/groonga-6.1.0.html --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8587134ad39..babca9af168 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.0.9"; + version = "6.1.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1n7kf25yimgy9wy04hv5qvp4rzdzdr0ar92lhwms812qkhp3i4mq"; + sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ From 7668d3e69bd546a16738c6490cfe02b1f9d4e80b Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Nov 2016 12:58:53 +0900 Subject: [PATCH 112/336] styx: 0.2.0 -> 0.3.1 (#20118) --- pkgs/applications/misc/styx/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 29d7067e235..aa1c1deebd6 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "1bcd0ss628mhchrl85fy6acxcxqvm1d3qywfaxhikahl1r7inpwg"; + sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni"; }; server = caddy.bin; @@ -19,13 +19,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - install -D -m 777 $sourceRoot/styx.sh $out/bin/styx + install -D -m 777 styx.sh $out/bin/styx mkdir -p $out/share/styx - cp -r $sourceRoot/sample $out/share/styx + cp -r lib $out/share/styx + cp -r scaffold $out/share/styx mkdir -p $out/share/doc/styx - asciidoctor $sourceRoot/doc/manual.doc -o $out/share/doc/styx/index.html + asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html substituteAllInPlace $out/bin/styx substituteAllInPlace $out/share/doc/styx/index.html From 5d6eaaa179ed03426734c08a24deb2523c945459 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Nov 2016 13:01:36 +0900 Subject: [PATCH 113/336] screenfetch: add bc dependency (#20097) --- pkgs/tools/misc/screenfetch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index a6891886664..c138261f9a3 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused -, findutils, xdpyinfo, xprop, gnugrep, ncurses +, bc, findutils, xdpyinfo, xprop, gnugrep, ncurses }: stdenv.mkDerivation { @@ -30,7 +30,8 @@ stdenv.mkDerivation { --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ --prefix PATH : "${gnugrep}/bin" \ - --prefix PATH : "${ncurses}/bin" + --prefix PATH : "${ncurses}/bin" \ + --prefix PATH : "${bc}/bin" ''; meta = { From 7fd38dc8b32d12236c7b82f401d21dbd9d62e9fd Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Thu, 3 Nov 2016 13:02:14 +0900 Subject: [PATCH 114/336] znc module: optionSet -> submodule (#20096) --- nixos/modules/services/networking/znc.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 676e82aa893..76ba78ff366 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -208,11 +208,10 @@ in networks = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule networkOpts); description = '' IRC networks to connect the user to. ''; - options = [ networkOpts ]; example = { "freenode" = { server = "chat.freenode.net"; From d19967bf48c5605cb984b0f15863f013043c8ad9 Mon Sep 17 00:00:00 2001 From: "Peter J. Jones" Date: Wed, 2 Nov 2016 21:06:47 -0700 Subject: [PATCH 115/336] vsftpd service: add extraConfig option, set anon_root (#20069) This commit includes two changes: 1. A new `extraConfig` option to allow administrators to set any vsftpd configuration option that isn't directly supported by this derivation. 2. Correctly set the `anon_root` vsftpd option to `anonymousUserHome` --- nixos/modules/services/networking/vsftpd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 7ec484941ed..deff645d9bf 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -100,6 +100,10 @@ let seccomp_sandbox=NO ''} anon_umask=${cfg.anonymousUmask} + ${optionalString cfg.anonymousUser '' + anon_root=${cfg.anonymousUserHome} + ''} + ${cfg.extraConfig} ''; in @@ -163,6 +167,13 @@ in description = "Anonymous write umask."; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "ftpd_banner=Hello"; + description = "Extra configuration to add at the bottom of the generated configuration file."; + }; + } // (listToAttrs (catAttrs "nixosOption" optionDescription)); }; From a94bd88d7af53b2052035a76eaf474047a5ac614 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 3 Nov 2016 05:11:58 +0100 Subject: [PATCH 116/336] memcached: 1.4.20 -> 1.4.33 Fixes: - CVE-2016-8704 - CVE-2016-8705 - CVE-2016-8706 Closes #20079. cc #20078 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 72b12d5aad5..166c5cdbf52 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.20"; + name = "memcached-1.4.33"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0620llasj8xgffk6hk2ml15z0c5i34455wwg60i1a2zdir023l95"; + sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3"; }; buildInputs = [cyrus_sasl libevent]; From 26256b7cea2957e457a3f9d897c8eb4e3e6f134f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2016 18:06:39 +0200 Subject: [PATCH 117/336] ocamlPackages.zarith: fix build in chrooted environments --- pkgs/development/ocaml-modules/zarith/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 09cefdfbb69..2cb4fdcd301 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib pkgconfig perl ]; propagatedBuildInputs = [ gmp ]; - patchPhase = '' - substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' - ''; + patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; From 51652ac3aaa4c944023f9ad1dbc6a6858f9bacb4 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 3 Nov 2016 09:37:51 +0100 Subject: [PATCH 118/336] smokeping service: Use setuid-wrapped fping binary The current default probe config uses the unwrapped fping binary, which leads to an error because fping must be executed with elevated permissions. I fixed this by changing the path to the default binary to the setuid-wrapped version. --- nixos/modules/services/networking/smokeping.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 6084dbdbf78..005655f111a 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -221,7 +221,7 @@ in type = types.string; default = '' + FPing - binary = ${pkgs.fping}/bin/fping + binary = ${config.security.wrapperDir}/fping ''; description = "Probe configuration"; }; From b6bd555c66cfad421e61ae0cf82a0be50be67cc2 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 3 Nov 2016 10:46:39 +0100 Subject: [PATCH 119/336] perl-Archive-Cpio: 0.09 -> 0.10 Also add license field. --- pkgs/top-level/perl-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 99e698f0771..2c4e70c7cd1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -394,14 +394,16 @@ let self = _self // overrides; _self = with self; { }; }; - ArchiveCpio = buildPerlPackage { - name = "Archive-Cpio-0.09"; + ArchiveCpio = buildPerlPackage rec { + name = "Archive-Cpio-0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.09.tar.gz; - sha256 = "1cf8k5zjykdbc1mn8lixlkij6jklwn6divzyq2grycj3rpd36g5c"; + url = "mirror://cpan/authors/id/P/PI/PIXEL/${name}.tar.gz"; + sha256 = "246fb31669764e78336b2191134122e07c44f2d82dc4f37d552ab28f8668bed3"; }; meta = { description = "Module for manipulations of cpio archives"; + # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710 + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.linux; }; }; From 2d524a37f85dcb00ab85f645479cb11f771022af Mon Sep 17 00:00:00 2001 From: Christian Lask Date: Thu, 3 Nov 2016 11:54:54 +0100 Subject: [PATCH 120/336] Remove myself as maintainer. --- lib/maintainers.nix | 1 - pkgs/applications/audio/caudec/default.nix | 1 - pkgs/applications/audio/ncmpc/default.nix | 2 -- pkgs/applications/audio/pamixer/default.nix | 1 - pkgs/applications/networking/mailreaders/neomutt/default.nix | 2 +- pkgs/applications/window-managers/lemonbar/xft.nix | 1 - pkgs/applications/window-managers/stumpwm/default.nix | 2 +- pkgs/applications/window-managers/yabar/default.nix | 1 - pkgs/data/fonts/mononoki/default.nix | 1 - pkgs/tools/security/pass/rofi-pass.nix | 2 +- 10 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5a5d58e6f96..cf996b6c32d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -187,7 +187,6 @@ hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; henrytill = "Henry Till "; - hiberno = "Christian Lask "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 3488d8fb38f..04f0f9d3025 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ hiberno ]; }; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 6c53d1fe755..31185c0d0c2 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hiberno ]; platforms = platforms.all; }; } - diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 56db4e8352e..fa25a474c1d 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cdemoulins/pamixer; license = licenses.gpl3; - maintainers = with maintainers; [ hiberno ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index c1c7947cd0a..e3cbd17e267 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ hiberno cstrahan vrthra ]; + maintainers = with maintainers; [ cstrahan vrthra ]; }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 132c10ae973..a1334112cf9 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight xcb based bar with XFT-support"; homepage = https://github.com/krypt-n/bar; - maintainers = [ stdenv.lib.maintainers.hiberno ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 2ce69a68f32..ac577385ad4 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager for X11"; homepage = https://github.com/stumpwm/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hiberno the-kenny ]; + maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix index c199cf6c01b..34d42425253 100644 --- a/pkgs/applications/window-managers/yabar/default.nix +++ b/pkgs/applications/window-managers/yabar/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern and lightweight status bar for X window managers"; homepage = "https://github.com/geommer/yabar"; - maintainers = [ maintainers.hiberno ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index fe429fe1df8..d93c0fb96d4 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/madmalik/mononoki; description = "A font for programming and code review"; license = licenses.ofl; - maintainers = [ maintainers.hiberno ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 64c12dc6e5e..165091d934a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; From 93fbb947b345da190d52da6f9e48d46194bb8f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 3 Nov 2016 12:14:45 +0100 Subject: [PATCH 121/336] aspcud: fix by updating the dependencies (#20086) Depends on gringo but gringo is now maintained as part of the clingo suite. This commit removes gringo (standalone) and replace it with the latest version of clingo. This update follows closely the old derivation for gringo (see 99e06fe). --- pkgs/tools/misc/aspcud/default.nix | 6 +-- pkgs/tools/misc/clingo/default.nix | 37 ++++++++++++++++++ pkgs/tools/misc/gringo/default.nix | 39 ------------------- .../misc/gringo/gringo-4.5.4-cmath.patch | 11 ------ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 41 insertions(+), 54 deletions(-) create mode 100644 pkgs/tools/misc/clingo/default.nix delete mode 100644 pkgs/tools/misc/gringo/default.nix delete mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 577c0a33b3e..0bdcfa76fec 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c + boost, clasp, cmake, clingo, re2c }: let @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; }; - buildInputs = [ boost clasp cmake gringo re2c ]; + buildInputs = [ boost clasp cmake clingo re2c ]; buildPhase = '' cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ + -DGRINGO_LOC=${clingo}/bin/gringo \ -DCLASP_LOC=${clasp}/bin/clasp \ -DENCODING_LOC=$out/share/aspcud/specification.lp \ . diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix new file mode 100644 index 00000000000..6ab0a68920f --- /dev/null +++ b/pkgs/tools/misc/clingo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, + bison, re2c, scons +}: + +let + version = "5.1.0"; +in + +stdenv.mkDerivation rec { + name = "clingo-${version}"; + + src = fetchFromGitHub { + owner = "potassco"; + repo = "clingo"; + rev = "v${version}"; + sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv"; + }; + + buildInputs = [ bison re2c scons ]; + + buildPhase = '' + scons --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A grounder and solver for logic programs."; + homepage = http://potassco.org; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix deleted file mode 100644 index ae71c01314c..00000000000 --- a/pkgs/tools/misc/gringo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, - bison, re2c, scons -}: - -let - version = "4.5.4"; -in - -stdenv.mkDerivation rec { - name = "gringo-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; - sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; - }; - - buildInputs = [ bison re2c scons ]; - - patches = [ - ./gringo-4.5.4-cmath.patch - ]; - - buildPhase = '' - scons --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/gringo $out/bin/gringo - ''; - - meta = with stdenv.lib; { - description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = http://potassco.sourceforge.net/; - platforms = platforms.linux; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch deleted file mode 100644 index 7b5510e2344..00000000000 --- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 -+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 -@@ -22,6 +22,8 @@ - #include "gringo/logger.hh" - #include "gringo/graph.hh" - -+#include -+ - namespace Gringo { - - // {{{ definition of Defines diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb17f5eaae3..44e788af7c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -864,7 +864,7 @@ in goa = callPackage ../development/tools/goa { }; - gringo = callPackage ../tools/misc/gringo { }; + clingo = callPackage ../tools/misc/clingo { }; gti = callPackage ../tools/misc/gti { }; From 12088f2ba142c6727e2d27341e0302e54b9b1c67 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 3 Nov 2016 12:53:06 +0100 Subject: [PATCH 122/336] mpv: add support for drm, fixes vaapi --- pkgs/applications/video/mpv/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b41eae41a5c..3ed58017fe2 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -31,6 +31,7 @@ , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null +, drmSupport ? true, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null , jackaudioSupport ? false, libjack2 ? null @@ -65,6 +66,7 @@ assert youtubeSupport -> available youtube-dl; assert vapoursynthSupport -> available vapoursynth; assert jackaudioSupport -> available libjack2; assert vaapiSupport -> available libva; +assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but @@ -133,6 +135,7 @@ in stdenv.mkDerivation rec { ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca ++ optional vaapiSupport libva + ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] From ce22a9c7baee91e11fe05e47f0c7d76f6a118d3b Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Thu, 3 Nov 2016 12:54:29 +0100 Subject: [PATCH 123/336] =?UTF-8?q?airwave:=201.3.2=20=E2=86=92=201.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/airwave/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 95f86ad60ad..39946fd5c7d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -4,13 +4,13 @@ let - version = "1.3.2"; + version = "1.3.3"; airwave-src = fetchFromGitHub { owner = "phantom-code"; repo = "airwave"; rev = version; - sha256 = "053kkx5yq1vas0qisidkgq0h6hzfwy3677jprjkcrwc4hp2i2v12"; + sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; stdenv_multi = overrideCC stdenv gcc_multi; @@ -60,6 +60,9 @@ stdenv_multi.mkDerivation { # shrinking. dontPatchELF = true; + # Cf. https://github.com/phantom-code/airwave/issues/57 + hardeningDisable = [ "format" ]; + cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}"; postInstall = '' From d9b5cd41c50c515d0f41b8a6292e7c49ab35aa61 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 3 Nov 2016 13:54:41 +0100 Subject: [PATCH 124/336] grsecurity: 4.7.10-201610262029 -> 201611011946 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 11f07f13345..6bba248374b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,8 +87,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.7.10"; - grrev = "201610262029"; - sha256 = "0bczfyb0zazccl9d8sxm4p34nayamyiv7c1hp272glcjjmvlb7cv"; + grrev = "201611011946"; + sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 0c8859fd17eb9a95b04449a599c62bab4b5d677d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 2 Nov 2016 14:35:40 +0100 Subject: [PATCH 125/336] ocaml-ptime: init at 0.8.2 --- .../ocaml-modules/ptime/default.nix | 47 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ptime/default.nix diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix new file mode 100644 index 00000000000..bb850019731 --- /dev/null +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}: + +let ocaml-version = stdenv.lib.getVersion ocaml; in + +buildOcaml rec { + version = "0.8.2"; + name = "ptime"; + + src = fetchurl { + url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; + sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj"; + }; + + unpackCmd = "tar -xf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + propagatedBuildInputs = [ result ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false + ''; + + installPhase = '' + opam-installer --script --prefix=$out ptime.install | sh + ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + meta = { + homepage = http://erratique.ch/software/ptime; + description = "POSIX time for OCaml."; + longDescription = '' + Ptime has platform independent POSIX time support in pure OCaml. + It provides a type to represent a well-defined range of POSIX timestamps + with picosecond precision, conversion with date-time values, conversion + with RFC 3339 timestamps and pretty printing to a human-readable, + locale-independent representation. + + The additional Ptime_clock library provides access to a system POSIX clock + and to the system's current time zone offset. + + Ptime is not a calendar library. + ''; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 58e9512e31c..c4381ea484b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -340,6 +340,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + ptime = callPackage ../development/ocaml-modules/ptime { }; + re2_p4 = callPackage ../development/ocaml-modules/re2 { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; From 32e86a3e2a474f937a68c8d7d06d125ef24574c6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 00:52:55 +0100 Subject: [PATCH 126/336] ppx_sexp_conv: use sexplib_p4 instead of sexplib This prevents potential interface incompatibilities if newer compiler versions are used --- pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index bf4a7b214de..729e28e2d2f 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,10 +1,10 @@ {stdenv, buildOcamlJane, - ppx_core, ppx_tools, ppx_type_conv, sexplib}: + ppx_core, ppx_tools, ppx_type_conv, sexplib_p4}: buildOcamlJane rec { name = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; - propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib_p4 ]; meta = with stdenv.lib; { description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library"; From d8686b4949b4d67844f8f9047167fc85bfbeca08 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:09:54 +0100 Subject: [PATCH 127/336] ocaml-nocrypto: 0.5.1 -> 0.5.3 --- .../ocaml-modules/nocrypto/default.nix | 33 ++++++++++++------- pkgs/top-level/ocaml-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index f8db935b612..b56d04b062c 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, type_conv, zarith, ounit, ocaml_oasis, ppx_sexp_conv +, lwt ? null +, withLwt ? true}: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +with stdenv.lib; +assert withLwt -> lwt != null; -stdenv.mkDerivation rec { - name = "ocaml-nocrypto-${version}"; - version = "0.5.1"; +buildOcaml rec { + name = "nocrypto"; + version = "0.5.3"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; - sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-nocrypto"; + rev = "v${version}"; + sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; }; - buildInputs = [ ocaml findlib type_conv ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml ocaml_oasis findlib type_conv ounit ppx_sexp_conv ]; + propagatedBuildInputs = [ cstruct zarith ] ++ optional withLwt lwt; + + configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; - configureFlags = "--enable-tests"; doCheck = true; checkTarget = "test"; createFindlibDestdir = true; @@ -22,7 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c4381ea484b..45c57168622 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -257,7 +257,9 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { + lwt = ocaml_lwt; + }; ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; From 361975cd93dd9ca73153cb74b3af99348cb9313e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:14:44 +0100 Subject: [PATCH 128/336] ocaml-cstruct: 1.6.0 -> 2.3.0 This commit also refactors the expression. --- .../ocaml-modules/cstruct/default.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index c9f04918d17..0c011bab0fd 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,20 +1,40 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, - async_p4 ? null, lwt ? null, camlp4}: +{stdenv, buildOcaml, fetchFromGitHub, writeText, + ocaml, ocplib-endian, sexplib_p4, findlib, ounit, camlp4, + async_p4 ? null, lwt ? null, ppx_tools ? null, + withAsync ? true, withLwt ? true, withPpx ? true}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +with stdenv.lib; +assert withAsync -> async_p4 != null; +assert withLwt -> lwt != null; +assert withPpx -> ppx_tools != null; -stdenv.mkDerivation { - name = "ocaml-cstruct-1.6.0"; +buildOcaml rec { + name = "cstruct"; + version = "2.3.0"; - src = fetchurl { - url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; - sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cstruct"; + rev = "v${version}"; + sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; }; - configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ - (if async_p4 != null then ["--enable-async"] else [])); - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; + configureFlags = [ "--enable-tests" ] ++ + optional withLwt [ "--enable-lwt" ] ++ + optional withAsync [ "--enable-async" ] ++ + optional withPpx ["--enable-ppx"]; + configurePhase = "./configure --prefix $out $configureFlags"; + + buildInputs = [ ocaml findlib camlp4 ounit ]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 ] ++ + optional withPpx ppx_tools ++ + optional withAsync async_p4 ++ + optional withLwt lwt; + + doCheck = true; + checkTarget = "test"; createFindlibDestdir = true; dontStrip = true; From 750342082b875d0b247b537428400532ca287373 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:15:35 +0100 Subject: [PATCH 129/336] ocaml-x509: 0.5.0 -> 0.5.3 This commit also refactors the expression. --- .../ocaml-modules/x509/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index c44ccb18982..bca266d5fee 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }: +{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: -let version = "0.5.0"; in +buildOcaml rec { + name = "x509"; + version = "0.5.3"; -stdenv.mkDerivation { - name = "ocaml-x509-${version}"; - - src = fetchzip { - url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz"; - sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn"; + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-x509"; + rev = "${version}"; + sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; propagatedBuildInputs = [ asn1-combinators nocrypto ]; configureFlags = "--enable-tests"; + configurePhase = "./configure --prefix $out $configureFlags"; + doCheck = true; checkTarget = "test"; createFindlibDestdir = true; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = licenses.bsd2; + maintainers = with maintainers; [ vbgl ]; }; } From d675e0d832793394d3c7d85d1e54b8956fb8b816 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 01:23:53 +0100 Subject: [PATCH 130/336] ocaml-tls: init at 0.7.1 --- .../development/ocaml-modules/tls/default.nix | 41 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tls/default.nix diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix new file mode 100644 index 00000000000..52a9aec90b2 --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -0,0 +1,41 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis +, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct +, withLwt ? true +, lwt ? null}: + +with stdenv.lib; +assert withLwt -> lwt != null; + +buildOcaml rec { + version = "0.7.1"; + name = "tls"; + + minimunSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-tls"; + rev = "${version}"; + sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; + }; + + buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ]; + propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ + optional withLwt lwt; + + configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ + optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; + + doCheck = true; + checkTarget = "test"; + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/mirleft/ocaml-tls; + description = "TLS in pure OCaml."; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 45c57168622..e47b428cf45 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -364,6 +364,10 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; + tls = callPackage ../development/ocaml-modules/tls { + lwt = ocaml_lwt; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; From db760a5edc5b3ffbf76250e0549ffc27ad23d54d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 02:12:14 +0100 Subject: [PATCH 131/336] ocaml-astring: init at 0.8.3 --- .../ocaml-modules/astring/default.nix | 43 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/astring/default.nix diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix new file mode 100644 index 00000000000..3c603b659a2 --- /dev/null +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}: + +buildOcaml rec { + version = "0.8.3"; + name = "astring"; + + src = fetchurl { + url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; + sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + }; + + unpackCmd = "tar -xf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build + ''; + + installPhase = '' + opam-installer --script --prefix=$out astring.install | sh + ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/ + ''; + + meta = { + homepage = http://erratique.ch/software/ptime; + description = "Alternative String module for OCaml."; + longDescription = '' + Astring exposes an alternative String module for OCaml. This module tries + to balance minimality and expressiveness for basic, index-free, string + processing and provides types and functions for substrings, string sets + and string maps. + + Remaining compatible with the OCaml String module is a non-goal. + The String module exposed by Astring has exception safe functions, removes + deprecated and rarely used functions, alters some signatures and names, + adds a few missing functions and fully exploits OCaml's newfound string + immutability. + ''; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e47b428cf45..d86bce06836 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -22,6 +22,8 @@ let asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + astring = callPackage ../development/ocaml-modules/astring { }; + async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; async_find = callPackage ../development/ocaml-modules/async_find { }; From 21a191df74e9b9ca8c32050d343177635a6b8ccd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:02:16 +0100 Subject: [PATCH 132/336] ocaml-uutf: 0.9.3 -> 0.9.4 This commit also refactors the expression --- .../ocaml-modules/uutf/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index fda630114ed..bdddf7d16b6 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,32 +1,38 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +buildOcaml rec { + name = pname; + version = "0.9.4"; -stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + minimumSupportedOcamlVersion = "3.12"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; }; buildInputs = [ ocaml findlib ocamlbuild opam ]; + propagatedBuildInputs = [ cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true"; + buildPhase = '' + ocaml pkg/git.ml + ocaml pkg/build.ml \ + native=true \ + native-dynlink=true \ + cmdliner=true + ''; installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --prefix=$out --script | sh + ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { From 18788cbac7fa912586510ecc2879ade0f20f7229 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:03:04 +0100 Subject: [PATCH 133/336] ocaml-uuseg: 0.8.0 -> 0.9.0 This commit also refactors the expression. --- .../ocaml-modules/uuseg/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 3c7a4ff5c58..2ba3dd02683 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,40 +1,39 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "uuseg"; - version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.01"; +buildOcaml rec { -stdenv.mkDerivation { + minimumSupportedOcamlVersion = "4.01"; - name = "ocaml-${pname}-${version}"; + name = pname; + version = "0.9.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; - propagatedBuildInputs = [ uucp uutf ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; + propagatedBuildInputs = [ uucp uutf cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; buildPhase = '' + ocaml pkg/git.ml ocaml pkg/build.ml \ native=true native-dynlink=true \ uutf=true cmdliner=true ''; installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + opam-installer --prefix $out --script | sh + ln -s $out/lib/uuseg $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { From 02388e9ba55972f8af428a65d8eb9684ec586dde Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 03:06:14 +0100 Subject: [PATCH 134/336] ocaml-notty: init at 0.1.1 --- .../ocaml-modules/notty/default.nix | 36 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/ocaml-modules/notty/default.nix diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix new file mode 100644 index 00000000000..431004b41b4 --- /dev/null +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildOcaml, fetchFromGitHub, findlib +, result, uucp, uuseg, uutf +, withLwt ? true +, lwt ? null }: + +with stdenv.lib; +assert withLwt -> lwt != null; + +buildOcaml rec { + version = "0.1.1"; + name = "notty"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "pqwy"; + repo = "notty"; + rev = "v${version}"; + sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01"; + }; + + buildInputs = [ findlib ]; + propagatedBuildInputs = [ result uucp uuseg uutf ] ++ + optional withLwt lwt; + + configureFlags = [ "--enable-unix" ] ++ + optional withLwt ["--enable-lwt"]; + configurePhase = "./configure --prefix $out $configureFlags"; + + meta = with stdenv.lib; { + homepage = https://github.com/pqwy/notty/tree/master; + description = "Declarative terminal graphics for OCaml."; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d86bce06836..55a5cd7c8cf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -263,6 +263,10 @@ let lwt = ocaml_lwt; }; + notty = callPackage ../development/ocaml-modules/notty { + lwt = ocaml_lwt; + }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; comparelib = callPackage ../development/ocaml-modules/comparelib { }; From 9554143a9c7eee341788780ff8da591dfe3ddc12 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 10:39:14 +0100 Subject: [PATCH 135/336] ocaml-otr: init at 0.3.3 --- .../development/ocaml-modules/otr/default.nix | 43 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/ocaml-modules/otr/default.nix diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix new file mode 100644 index 00000000000..08620754128 --- /dev/null +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -0,0 +1,43 @@ +{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, + ppx_tools, ppx_sexp_conv, cstruct, sexplib_p4, result, nocrypto, astring}: + +let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in + +buildOcaml rec { + name = "otr"; + version = "0.3.3"; + + minimumSupportedOcamlVersion = "4.02.2"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "ocaml-otr"; + rev = "${version}"; + sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; + }; + + buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ]; + propagatedBuildInputs = [ cstruct sexplib_p4 result nocrypto astring ]; + + buildPhase = '' + ocaml ${ocamlFlags} pkg/pkg.ml build \ + --tests true + ''; + + installPhase = '' + opam-installer --prefix=$out --script | sh + ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + doCheck = true; + checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/ocaml-otr; + description = "Off-the-record (OTR) messaging protocol, purely in OCaml."; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 55a5cd7c8cf..273e9d3d400 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -343,6 +343,8 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; + otr = callPackage ../development/ocaml-modules/otr { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; @@ -649,7 +651,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ); - + glsurf = callPackage ../applications/science/math/glsurf { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; From 096ec04b8221926609ad62dfb6cd6c7ade2fcd52 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 11:36:40 +0100 Subject: [PATCH 136/336] ocaml-erm_xmpp_0_3: init at 0.3 --- .../ocaml-modules/erm_xmpp/0.3.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/erm_xmpp/0.3.nix diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix new file mode 100644 index 00000000000..9a57c3f7b27 --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix @@ -0,0 +1,29 @@ +{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto, camlp4 }: + +buildOcaml rec { + version = "0.3"; + name = "erm_xmpp"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xmpp"; + rev = "eee18bd3dd343550169969c0b45548eafd51cfe1"; + sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5"; + }; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ erm_xml nocrypto ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + buildPhase = "ocaml setup.ml -build"; + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/hannesm/xmpp; + description = "OCaml based XMPP implementation (fork)."; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 273e9d3d400..873ce337a09 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -158,6 +158,8 @@ let erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { }; + estring = callPackage ../development/ocaml-modules/estring { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { From b0d11b11776e4d8589dd1a08eb5fa6d8ca21f85b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 3 Nov 2016 11:37:14 +0100 Subject: [PATCH 137/336] jackline: init at 2016-10-30 --- .../instant-messengers/jackline/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/jackline/default.nix diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix new file mode 100644 index 00000000000..b6ac19fdc37 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchFromGitHub, ocamlPackages}: + +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; + +stdenv.mkDerivation rec { + version = "2016-10-30"; + name = "jackline-${version}"; + + src = fetchFromGitHub { + owner = "hannesm"; + repo = "jackline"; + rev = "8d829b03f2cdad6b13260ad293aeaa44075bd894"; + sha256 = "1xsngldyracfb15jxa9h5qnpaywv6bn8gkg0hzccycjz1nfskl17"; + }; + + buildInputs = with ocamlPackages; [ + ocaml ocamlbuild findlib topkg ppx_sexp_conv + erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring + ptime notty sexplib_p4 hex uutf opam + ]; + + buildPhase = with ocamlPackages; '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build \ + --pinned true + ''; + + installPhase = '' + opam-installer --prefix=$out --script | sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/hannesm/jackline; + description = "Terminal-based XMPP client in pure OCaml."; + license = licenses.bsd2; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e788af7c4..e6ed34d0f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13251,6 +13251,10 @@ in hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_02; + }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; From af01fa71e0787c66c4f7e6fa88f8ee525959cd26 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 2 Nov 2016 19:27:01 +0100 Subject: [PATCH 138/336] nixos.libvirtd: fix broken VMs due to emulator path changes This had already been fixed in f52f9bf7cd922b54c874e5500a2c64277e57d417, but the problem was reintroduced in bce59a1a8bb0430533178df080937ce24efe926a because the path to the XML files changed. --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index ea503a9526f..5f669dee754 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -123,7 +123,7 @@ in { # config file. But this path can unfortunately be garbage collected # while still being used by the virtual machine. So update the # emulator path on each startup to something valid (re-scan $PATH). - for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do + for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do test -f "$file" || continue # get (old) emulator path from config file emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') From 662c5095a83599506266e09cc5fd067b47d1b2b5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 16 Oct 2016 03:08:40 +0300 Subject: [PATCH 139/336] pythonPackages.moreItertools: merge with more-itertools --- pkgs/top-level/python-packages.nix | 32 ++++++++++-------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 671e7e798a2..255f8947c57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28236,26 +28236,6 @@ in { }; - moreItertools = buildPythonPackage rec { - name = "more-itertools-2.2"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; - sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - homepage = https://more-itertools.readthedocs.org; - description = "Expansion of the itertools module"; - license = licenses.mit; - }; - }; - - uncertainties = buildPythonPackage rec { name = "uncertainties-${version}"; version = "3.0.1"; @@ -30055,7 +30035,7 @@ in { ndg-httpsclient dateutil inflection - moreItertools + more-itertools requests2 pandas ]; @@ -30671,6 +30651,8 @@ in { }; }; + moreItertools = self.more-itertools; + more-itertools = buildPythonPackage rec { name = "more-itertools-${version}"; version = "2.2"; @@ -30680,7 +30662,13 @@ in { sha256 = "1q3wqsg44z01g7i5z6j1wc0nf5c5h8g77xny6fia2gddqw2jxrlk"; }; - doCheck = false; + propagatedBuildInputs = with self; [ nose ]; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = licenses.mit; + }; }; jaraco_functools = buildPythonPackage rec { From 6693e3b06c733ed26719eebda87e53e56b9df24b Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Thu, 3 Nov 2016 15:27:03 +0100 Subject: [PATCH 140/336] bear: ignore wrapper calls (#20070) Fixes #20056 --- .../tools/build-managers/bear/default.nix | 2 ++ .../build-managers/bear/ignore_wrapper.patch | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/build-managers/bear/ignore_wrapper.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 0f0ee597920..2bfec89aa66 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { doCheck = false; # all fail + patches = [ ./ignore_wrapper.patch ]; + meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch new file mode 100644 index 00000000000..16d7a9bfd3e --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch @@ -0,0 +1,31 @@ +--- Bear-2.2.1-src/bear/main.py.in 1970-01-01 01:00:01.000000000 +0100 ++++ Bear-2.2.1-src-patch/bear/main.py.in 2016-11-02 20:23:38.050134984 +0100 +@@ -48,6 +48,7 @@ + import shutil + import contextlib + import logging ++from distutils.spawn import find_executable + + # Ignored compiler options map for compilation database creation. + # The map is used in `split_command` method. (Which does ignore and classify +@@ -447,7 +448,6 @@ + # do extra check on number of source files + return result if result.files else None + +- + def split_compiler(command): + """ A predicate to decide the command is a compiler call or not. + +@@ -467,7 +467,11 @@ + for pattern in COMPILER_CPP_PATTERNS) + + if command: # not empty list will allow to index '0' and '1:' +- executable = os.path.basename(command[0]) ++ absolute_executable = os.path.realpath(find_executable(command[0])) ++ if 'wrapper' in absolute_executable: ++ return None ++ ++ executable = os.path.basename(absolute_executable) + parameters = command[1:] + # 'wrapper' 'parameters' and + # 'wrapper' 'compiler' 'parameters' are valid. From 0a876d71cbf67dff769653f4fb11cd569ad165de Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 16 Oct 2016 03:09:36 +0300 Subject: [PATCH 141/336] pythonPackages.jaraco_functools: 1.11 -> 1.15.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 255f8947c57..cfbb731ed61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30673,14 +30673,14 @@ in { jaraco_functools = buildPythonPackage rec { name = "jaraco.functools-${version}"; - version = "1.11"; + version = "1.15.1"; src = pkgs.fetchurl { url = "mirror://pypi/j/jaraco.functools/${name}.tar.gz"; - sha256 = "08n7vxdbsl0637b1ap2x3rg698d2as0wzvvpx05dzkrdgsgxrx3g"; + sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya"; }; - propagatedBuildInputs = with self; [ backports_functools_lru_cache ]; + propagatedBuildInputs = with self; [ more-itertools backports_functools_lru_cache ]; doCheck = false; From a6283c1126676d30de3abfb3ee8865505da0ed43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 3 Nov 2016 15:36:30 +0100 Subject: [PATCH 142/336] devmem2: init at 2004-08-05 A simple program to read/write from/to any location in memory. Unfortunately the homepage doesn't have a versioned source code download URL. On the other hand, the program is pretty stable, with no change for the last 12 years... --- pkgs/os-specific/linux/devmem2/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/devmem2/default.nix diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix new file mode 100644 index 00000000000..17450f36daa --- /dev/null +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "devmem2-2004-08-05"; + + src = fetchurl { + url = "http://lartmaker.nl/lartware/port/devmem2.c"; + sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c"; + }; + + buildCommand = '' + export hardeningDisable=format # fix compile error + cc "$src" -o devmem2 + install -D devmem2 "$out/bin/devmem2" + ''; + + meta = with stdenv.lib; { + description = "Simple program to read/write from/to any location in memory"; + homepage = "http://lartmaker.nl/lartware/port/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e788af7c4..2363c738439 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -771,6 +771,8 @@ in deisctl = callPackage ../development/tools/deisctl {}; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; + diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; From e829d828611dd1b9201e962e427de4a74b9c5a5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Nov 2016 18:09:06 +0300 Subject: [PATCH 143/336] nodePackages.parsoid: init --- pkgs/development/node-packages/node-env.nix | 109 +- .../node-packages/node-packages-v4.nix | 1580 ++++++++++++----- .../node-packages/node-packages.json | 1 + 3 files changed, 1174 insertions(+), 516 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index c5c69c7d05d..5819fd1c2e7 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -6,19 +6,19 @@ let # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin - + cat > $out/bin/tar < package.json < Date: Sat, 15 Oct 2016 21:54:32 +0300 Subject: [PATCH 144/336] parsoid service: fix for new parsoid --- nixos/modules/services/misc/parsoid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index 0844190a549..da090b08f34 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -91,7 +91,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}"; + ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; }; }; From 5187c28f9192db77869f14d31c8f844e3859d463 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 16 Oct 2016 03:07:53 +0300 Subject: [PATCH 145/336] parsoid service: don't run as a superuser --- nixos/modules/services/misc/parsoid.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index da090b08f34..ab1b5406877 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -91,6 +91,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { + User = "nobody"; ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; }; }; From 7e9d6a1e269fcc78f34217acb0f8c0e0bea62ad6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 3 Nov 2016 16:23:30 +0000 Subject: [PATCH 146/336] terraform: 0.7.7 -> 0.7.8 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index bbceca88ae8..c7f2bc83c4d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.7"; + version = "0.7.8"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0wza5ladh406lf8hd4fbh4ri82qbcf91lif82357ldy78ghsi5g7"; + sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4"; }; postInstall = '' From a0cad9ad7524b6a97324d8b5dd839c88d735ef2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2016 17:24:44 +0100 Subject: [PATCH 147/336] LTS Haskell 7.6 --- .../configuration-hackage2nix.yaml | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2e89521fca8..c3c3d3145eb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.5 + # LTS Haskell 7.6 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,7 +146,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - - asciidiagram ==1.3.1.2 + - asciidiagram ==1.3.2 - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -264,7 +264,7 @@ default-package-overrides: - cabal-src ==0.3.0.2 - cache ==0.1.0.0 - cacophony ==0.8.0 - - cairo ==0.13.3.0 + - cairo ==0.13.3.1 - call-stack ==0.1.0 - camfort ==0.900 - carray ==0.1.6.5 @@ -631,7 +631,7 @@ default-package-overrides: - gi-pango ==1.0.3 - gi-soup ==2.4.3 - gi-webkit ==3.0.3 - - gio ==0.13.3.0 + - gio ==0.13.3.1 - gipeda ==0.3.2.2 - giphy-api ==0.4.0.0 - git-fmt ==0.4.1.0 @@ -645,7 +645,7 @@ default-package-overrides: - gl ==0.7.8.1 - glabrous ==0.1.2.0 - GLFW-b ==1.4.8.1 - - glib ==0.13.4.0 + - glib ==0.13.4.1 - Glob ==0.7.12 - gloss ==1.10.2.3 - gloss-rendering ==1.10.3.3 @@ -762,10 +762,10 @@ default-package-overrides: - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 - - gtk ==0.14.5 + - gtk ==0.14.6 - gtk2hs-buildtools ==0.13.2.1 - - gtk3 ==0.14.5 - - gtksourceview3 ==0.13.3.0 + - gtk3 ==0.14.6 + - gtksourceview3 ==0.13.3.1 - H ==0.9.0.1 - hackage-db ==1.22 - hackage-mirror ==0.1.1.1 @@ -846,9 +846,9 @@ default-package-overrides: - hjsmin ==0.2.0.2 - hjsonpointer ==1.0.0.2 - hjsonschema ==1.1.0.1 - - hledger ==0.27.1 + - hledger ==1.0.1 - hledger-interest ==1.4.4 - - hledger-lib ==0.27.1 + - hledger-lib ==1.0.1 - hlibgit2 ==0.18.0.15 - hlibsass ==0.1.5.0 - hlint ==1.9.35 @@ -876,7 +876,7 @@ default-package-overrides: - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.3 + - hpio ==0.8.0.4 - hprotoc ==2.4.0 - hquantlib ==0.0.3.2 - hreader ==1.0.2 @@ -938,7 +938,7 @@ default-package-overrides: - http-date ==0.0.6.1 - http-link-header ==1.0.2 - http-media ==0.6.4 - - http-reverse-proxy ==0.4.3.1 + - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 - http-types ==0.9.1 - http2 ==1.6.2 @@ -950,7 +950,7 @@ default-package-overrides: - hvect ==0.3.1.0 - hw-bits ==0.1.0.1 - hw-conduit ==0.0.0.11 - - hw-diagnostics ==0.0.0.4 + - hw-diagnostics ==0.0.0.5 - hw-parser ==0.0.0.1 - hw-prim ==0.1.0.3 - hw-rankselect ==0.3.0.0 @@ -990,7 +990,7 @@ default-package-overrides: - inline-r ==0.9.0.0 - insert-ordered-containers ==0.1.0.1 - integration ==0.2.1 - - intero ==0.1.18 + - intero ==0.1.19 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.1.1 @@ -1008,8 +1008,8 @@ default-package-overrides: - iproute ==1.7.1 - IPv6Addr ==0.6.1.0 - irc ==0.6.1.0 - - irc-client ==0.4.4.0 - - irc-conduit ==0.2.1.0 + - irc-client ==0.4.4.1 + - irc-conduit ==0.2.1.1 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.0 - islink ==0.1.0.0 @@ -1050,7 +1050,7 @@ default-package-overrides: - lackey ==0.4.1 - language-c ==0.5.0 - language-c-quote ==0.11.7 - - language-dockerfile ==0.3.4.0 + - language-dockerfile ==0.3.5.0 - language-ecmascript ==0.17.1.0 - language-fortran ==0.5.1 - language-glsl ==0.2.0 @@ -1148,7 +1148,7 @@ default-package-overrides: - MissingH ==1.4.0.1 - mmap ==0.5.9 - mmorph ==1.0.6 - - mockery ==0.3.3 + - mockery ==0.3.4 - modify-fasta ==0.8.2.1 - moesocks ==1.0.0.41 - monad-control ==1.0.1.0 @@ -1200,7 +1200,7 @@ default-package-overrides: - MusicBrainz ==0.2.4 - mustache ==2.1 - mutable-containers ==0.3.3 - - mwc-probability ==1.2.1 + - mwc-probability ==1.2.2 - mwc-random ==0.13.4.0 - mwc-random-monad ==0.7.3.1 - nagios-check ==0.3.2 @@ -1280,15 +1280,15 @@ default-package-overrides: - pagination ==0.1.1 - palette ==0.1.0.4 - pandoc ==1.17.1 - - pandoc-citeproc ==0.10.1.2 + - pandoc-citeproc ==0.10.2.2 - pandoc-types ==1.16.1.1 - - pango ==0.13.3.0 + - pango ==0.13.3.1 - parallel ==3.2.1.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.7 - parsec ==3.1.11 - parsers ==0.12.4 - - partial-handler ==1.0.1 + - partial-handler ==1.0.2 - path ==0.5.9 - path-extra ==0.0.3 - path-io ==1.2.0 @@ -1378,7 +1378,7 @@ default-package-overrides: - primitive ==0.6.1.0 - process-extras ==0.4.1.4 - product-profunctors ==0.7.1.0 - - profiteur ==0.3.0.2 + - profiteur ==0.3.0.3 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1390,7 +1390,7 @@ default-package-overrides: - protobuf-simple ==0.1.0.2 - protocol-buffers ==2.4.0 - protocol-buffers-descriptor ==2.4.0 - - protolude ==0.1.8 + - protolude ==0.1.10 - proxied ==0.2 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 @@ -1406,6 +1406,7 @@ default-package-overrides: - quantum-random ==0.6.3 - QuasiText ==0.1.2.6 - questioner ==0.1.1.0 + - quickbench ==1.0 - QuickCheck ==2.8.2 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.2.0 @@ -1470,7 +1471,7 @@ default-package-overrides: - repa-io ==3.4.1.1 - RepLib ==0.5.4 - reroute ==0.4.0.1 - - resolve-trivial-conflicts ==0.3.2.2 + - resolve-trivial-conflicts ==0.3.2.3 - resource-pool ==0.2.3.2 - resourcet ==1.1.8 - rest-client ==0.5.1.1 @@ -1597,7 +1598,7 @@ default-package-overrides: - spdx ==0.2.1.0 - speculation ==1.5.0.3 - speedy-slice ==0.1.3 - - sphinx ==0.6.0.1 + - sphinx ==0.6.0.2 - Spintax ==0.1.0.1 - splice ==0.6.1.1 - split ==0.2.3.1 @@ -1713,7 +1714,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.8 - testing-feat ==0.4.0.3 - - texmath ==0.8.6.6 + - texmath ==0.8.6.7 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 @@ -1859,7 +1860,7 @@ default-package-overrides: - vinyl ==0.5.2 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - - vty ==5.11.1 + - vty ==5.11.3 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-conduit ==3.0.0.3 @@ -1896,8 +1897,8 @@ default-package-overrides: - web-routes-wai ==0.24.3 - webdriver ==0.8.4 - webdriver-angular ==0.1.11 - - webkitgtk3 ==0.14.2.0 - - webkitgtk3-javascriptcore ==0.14.2.0 + - webkitgtk3 ==0.14.2.1 + - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.4 - webrtc-vad ==0.1.0.3 - websockets ==0.9.7.0 @@ -1909,7 +1910,7 @@ default-package-overrides: - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 - with-location ==0.1.0 - - withdependencies ==0.2.3 + - withdependencies ==0.2.4 - witherable ==0.1.3.3 - wizards ==1.0.2 - wl-pprint ==1.2 @@ -1968,7 +1969,7 @@ default-package-overrides: - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 - - yesod-form ==1.4.7.1 + - yesod-form ==1.4.8 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 @@ -1991,7 +1992,7 @@ default-package-overrides: - zip ==0.1.3 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - - zlib ==0.6.1.1 + - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zoom-refs ==0.0.0.1 From a170fb23403221c8d5533a9d84d9cde141fd8065 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2016 19:02:52 +0100 Subject: [PATCH 148/336] LTS Haskell 7.7 --- .../configuration-hackage2nix.yaml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c3c3d3145eb..51e300be303 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.6 + # LTS Haskell 7.7 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -284,9 +284,9 @@ default-package-overrides: - ChannelT ==0.0.0.2 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.1 - - Chart ==1.8 - - Chart-cairo ==1.8 - - Chart-diagrams ==1.8 + - Chart ==1.8.1 + - Chart-cairo ==1.8.1 + - Chart-diagrams ==1.8.1 - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 @@ -421,7 +421,7 @@ default-package-overrides: - dbus ==0.10.12 - debian-build ==0.10.1.0 - Decimal ==0.4.2 - - declarative ==0.2.2 + - declarative ==0.2.3 - deepseq-generics ==0.2.0.0 - dejafu ==0.4.0.0 - dependent-map ==0.2.3.0 @@ -811,7 +811,7 @@ default-package-overrides: - haskoin-core ==0.4.0 - hasql ==0.19.15.2 - hastache ==0.6.1 - - hasty-hamiltonian ==1.1.3 + - hasty-hamiltonian ==1.1.4 - HaTeX ==3.17.0.2 - hatex-guide ==1.3.1.5 - hbayes ==0.5.2 @@ -847,7 +847,7 @@ default-package-overrides: - hjsonpointer ==1.0.0.2 - hjsonschema ==1.1.0.1 - hledger ==1.0.1 - - hledger-interest ==1.4.4 + - hledger-interest ==1.5 - hledger-lib ==1.0.1 - hlibgit2 ==0.18.0.15 - hlibsass ==0.1.5.0 @@ -901,11 +901,11 @@ default-package-overrides: - HsOpenSSL ==0.11.3.2 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.2.3 + - hspec ==2.2.4 - hspec-attoparsec ==0.1.0.2 - hspec-contrib ==0.3.0 - - hspec-core ==2.2.3 - - hspec-discover ==2.2.3 + - hspec-core ==2.2.4 + - hspec-discover ==2.2.4 - hspec-expectations ==0.7.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 @@ -1121,7 +1121,7 @@ default-package-overrides: - matrix ==0.3.5.0 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - - mcmc-types ==1.0.1 + - mcmc-types ==1.0.2 - megaparsec ==5.0.1 - memory ==0.13 - MemoTrie ==0.6.4 @@ -1139,7 +1139,7 @@ default-package-overrides: - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.0 - microlens-th ==0.4.1.0 - - mighty-metropolis ==1.0.2 + - mighty-metropolis ==1.0.3 - mime-mail ==0.4.11 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 @@ -1307,7 +1307,7 @@ default-package-overrides: - pdfinfo ==1.5.4 - pem ==0.2.2 - permutation ==0.5.0.5 - - persistable-record ==0.4.0.3 + - persistable-record ==0.4.1.0 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 - persistent-postgresql ==2.6 @@ -1597,7 +1597,7 @@ default-package-overrides: - sourcemap ==0.1.6 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - - speedy-slice ==0.1.3 + - speedy-slice ==0.1.4 - sphinx ==0.6.0.2 - Spintax ==0.1.0.1 - splice ==0.6.1.1 From ed9f1c575b335e31141601190cf06abb9281c99d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2016 19:01:49 +0100 Subject: [PATCH 149/336] git-annex: update version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 627b0261ce9..46a37647fde 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -43,7 +43,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc"; + sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01"; rev = drv.version; }; })).overrideScope (self: super: { From 306953581dad6ca52a83f25dca241e24d34b01eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2016 16:23:16 +0100 Subject: [PATCH 150/336] haskell-swagger: disable Haddock phase Citing from http://hydra.cryp.to/build/2035868/nixlog/1/raw: haddock: internal error: spliceURL UnhelpfulSpan --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 46a37647fde..8bd6f632a3c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -149,6 +149,7 @@ self: super: { network-conduit = dontHaddock super.network-conduit; shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; + swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; From c6cd4ee35de336efc0f70352d3d38503ca7f6dee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2016 19:01:01 +0100 Subject: [PATCH 151/336] configuration-hackage2nix.yaml: update list of broken builds --- .../configuration-hackage2nix.yaml | 72 ++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 51e300be303..c55f48f169e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -862,7 +862,6 @@ default-package-overrides: - hocilib ==0.1.0 - holy-project ==0.2.0.1 - homplexity ==0.4.3.3 - - hoogle ==5.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 @@ -1555,7 +1554,6 @@ default-package-overrides: - shake-language-c ==0.10.0 - shakespeare ==2.0.11.1 - shell-conduit ==4.5.2 - - ShellCheck ==0.4.4 - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 @@ -2219,6 +2217,7 @@ dont-distribute-packages: al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] + alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2242,7 +2241,11 @@ dont-distribute-packages: amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2361,8 +2364,10 @@ dont-distribute-packages: authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] + autom: [ i686-linux, x86_64-linux, x86_64-darwin ] avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2725,6 +2730,7 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2737,6 +2743,7 @@ dont-distribute-packages: checked: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2845,6 +2852,7 @@ dont-distribute-packages: collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] + colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3028,6 +3036,7 @@ dont-distribute-packages: curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ] curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3110,6 +3119,8 @@ dont-distribute-packages: dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3178,6 +3189,7 @@ dont-distribute-packages: dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3411,6 +3423,7 @@ dont-distribute-packages: error-util: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] + escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3484,6 +3497,7 @@ dont-distribute-packages: fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3519,6 +3533,7 @@ dont-distribute-packages: FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3797,6 +3812,7 @@ dont-distribute-packages: glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] + glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4121,6 +4137,8 @@ dont-distribute-packages: haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4301,6 +4319,9 @@ dont-distribute-packages: hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4398,6 +4419,7 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4470,6 +4492,8 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4643,6 +4667,7 @@ dont-distribute-packages: hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstox: [ i686-linux, x86_64-linux, x86_64-darwin ] hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ] HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4682,6 +4707,7 @@ dont-distribute-packages: httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hub: [ i686-linux, x86_64-linux, x86_64-darwin ] hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4703,11 +4729,18 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4720,6 +4753,7 @@ dont-distribute-packages: hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-expat: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4738,6 +4772,7 @@ dont-distribute-packages: hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] + hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4849,6 +4884,7 @@ dont-distribute-packages: IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] + ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4914,6 +4950,7 @@ dont-distribute-packages: jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] + jni: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4955,6 +4992,7 @@ dont-distribute-packages: jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] + juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4962,6 +5000,7 @@ dont-distribute-packages: JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5109,6 +5148,7 @@ dont-distribute-packages: learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] + legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5213,6 +5253,7 @@ dont-distribute-packages: list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5347,6 +5388,7 @@ dont-distribute-packages: marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] + marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5550,6 +5592,7 @@ dont-distribute-packages: mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5595,6 +5638,7 @@ dont-distribute-packages: n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5635,8 +5679,10 @@ dont-distribute-packages: nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5708,6 +5754,7 @@ dont-distribute-packages: notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] + ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5725,6 +5772,7 @@ dont-distribute-packages: nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] + obd: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] obj: [ i686-linux, x86_64-linux, x86_64-darwin ] Object: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5946,6 +5994,7 @@ dont-distribute-packages: pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6115,6 +6164,7 @@ dont-distribute-packages: puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6205,6 +6255,7 @@ dont-distribute-packages: Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6224,6 +6275,8 @@ dont-distribute-packages: reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6486,6 +6539,7 @@ dont-distribute-packages: Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6505,6 +6559,7 @@ dont-distribute-packages: selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] + semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6524,10 +6579,15 @@ dont-distribute-packages: serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6597,6 +6657,7 @@ dont-distribute-packages: showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] + sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6635,6 +6696,7 @@ dont-distribute-packages: simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] + siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6988,6 +7050,7 @@ dont-distribute-packages: teams: [ i686-linux, x86_64-linux, x86_64-darwin ] teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7225,6 +7288,7 @@ dont-distribute-packages: type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7319,6 +7383,7 @@ dont-distribute-packages: var: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] variables: [ i686-linux, x86_64-linux, x86_64-darwin ] + vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7342,6 +7407,7 @@ dont-distribute-packages: verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7537,6 +7603,7 @@ dont-distribute-packages: xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7599,6 +7666,7 @@ dont-distribute-packages: yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] From 38dc05fd0676f09dd80e40dcae6438fabe22e7a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 07:54:31 +0100 Subject: [PATCH 152/336] Update hoogle and structured-haskell-mode to latest version of haskell-src-exts. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8bd6f632a3c..7a0abf51bbc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -299,7 +299,7 @@ self: super: { hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; @@ -802,7 +802,7 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; })).override { - haskell-src-exts = self.haskell-src-exts_1_18_2; + haskell-src-exts = self.haskell-src-exts_1_19_0; }; # # Make elisp files available at a location where people expect it. From c491309d612acd13f5c149399372f2467705140b Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Tue, 1 Nov 2016 19:04:53 -0700 Subject: [PATCH 153/336] ghcjs: add ghcsjHEAD, tracking ghc-8.0 branch Closes https://github.com/NixOS/nixpkgs/pull/20071. Closes https://github.com/NixOS/nixpkgs/issues/19905. --- pkgs/development/compilers/ghcjs/head.nix | 178 ++++++++++++++++++ .../compilers/ghcjs/head_shims.nix | 7 + pkgs/top-level/haskell-packages.nix | 7 + 3 files changed, 192 insertions(+) create mode 100644 pkgs/development/compilers/ghcjs/head.nix create mode 100644 pkgs/development/compilers/ghcjs/head_shims.nix diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix new file mode 100644 index 00000000000..2bf13cb895f --- /dev/null +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -0,0 +1,178 @@ +{ mkDerivation +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, data-default +, ghc-paths +, haskell-src-exts +, haskell-src-meta +, optparse-applicative +, system-fileio +, system-filepath +, text-binary +, unordered-containers +, cabal-install +, wl-pprint-text +, base16-bytestring +, executable-path +, transformers-compat +, haddock-api +, regex-posix +, callPackage + +, bootPkgs, gmp +, jailbreak-cabal + +, runCommand +, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm +, time +, zlib, aeson, attoparsec, bzlib, hashable +, lens +, parallel, safe, shelly, split, stringsearch, syb +, tar, terminfo +, vector, yaml, fetchgit, fetchFromGitHub, Cabal +, alex, happy, git, gnumake, autoconf, patch +, automake, libtool +, cryptohash +, haddock, hspec, xhtml, primitive, cacert, pkgs +, coreutils +, libiconv + +, ghcjsBootSrc ? fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; + sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; + fetchSubmodules = true; + } +, ghcjsBoot ? import ./ghcjs-boot.nix { + inherit runCommand; + src = ghcjsBootSrc; + } +, shims ? import ./head_shims.nix { inherit fetchFromGitHub; } +}: +let + inherit (bootPkgs) ghc; + version = "0.2.020161101"; + +in mkDerivation (rec { + pname = "ghcjs"; + inherit version; + src = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs"; + rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; + sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; + }; + isLibrary = true; + isExecutable = true; + jailbreak = true; + doHaddock = false; + doCheck = false; + buildDepends = [ + filepath HTTP mtl network random stm time zlib aeson attoparsec + bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta + lens optparse-applicative parallel safe shelly split + stringsearch syb system-fileio system-filepath tar terminfo text-binary + unordered-containers vector wl-pprint-text yaml + alex happy git gnumake autoconf automake libtool patch gmp + base16-bytestring cryptohash executable-path haddock-api + transformers-compat QuickCheck haddock hspec xhtml + regex-posix libiconv + ]; + buildTools = [ nodejs git ]; + testDepends = [ + HUnit test-framework test-framework-hunit + ]; + patches = [ ./ghcjs.patch ]; + postPatch = '' + substituteInPlace Setup.hs \ + --replace "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace src/Compiler/Info.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@VERSION@" "${version}" + + substituteInPlace src-bin/Boot.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@CC@" "${stdenv.cc}/bin/cc" + ''; + preBuild = '' + export HOME="$TMP" + + local topDir=$out/lib/ghcjs-${version} + mkdir -p $topDir + + cp -r ${ghcjsBoot} $topDir/ghcjs-boot + chmod -R u+w $topDir/ghcjs-boot + + cp -r ${shims} $topDir/shims + chmod -R u+w $topDir/shims + + # Make the patches be relative their corresponding package's directory. + # See: https://github.com/ghcjs/ghcjs-boot/pull/12 + for patch in "$topDir/ghcjs-boot/patches/"*.patch; do + echo "fixing patch: $patch" + sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch + done + ''; + # We build with --quick so we can build stage 2 packages separately. + # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a + # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw + postInstall = '' + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ + env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ + --dev \ + --quick \ + --with-cabal ${cabal-install}/bin/cabal \ + --with-gmp-includes ${gmp.dev}/include \ + --with-gmp-libraries ${gmp.out}/lib + ''; + passthru = let + ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix { + generated = ./node-packages-generated.nix; + self = ghcjsNodePkgs; + }; + in { + inherit bootPkgs; + isCross = true; + isGhcjs = true; + inherit nodejs ghcjsBoot; + inherit (ghcjsNodePkgs) "socket.io"; + + # This is the list of the Stage 1 packages that are built into a booted ghcjs installation + # It can be generated with the command: + # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" + stage1Packages = [ + "array" + "base" + "binary" + "rts" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-prim" + "ghcjs-prim" + "integer-gmp" + "old-locale" + "pretty" + "primitive" + "process" + "template-haskell" + "time" + "transformers" + "unix" + ]; + + mkStage2 = import ./stage2.nix { + inherit ghcjsBoot; + }; + }; + + homepage = "https://github.com/ghcjs/ghcjs"; + description = "A Haskell to JavaScript compiler that uses the GHC API"; + license = stdenv.lib.licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; +}) diff --git a/pkgs/development/compilers/ghcjs/head_shims.nix b/pkgs/development/compilers/ghcjs/head_shims.nix new file mode 100644 index 00000000000..e321978f0bd --- /dev/null +++ b/pkgs/development/compilers/ghcjs/head_shims.nix @@ -0,0 +1,7 @@ +{ fetchFromGitHub }: +fetchFromGitHub { + owner = "ghcjs"; + repo = "shims"; + rev = "1f555d3ca072c61862cc35f92f5ac05f3b938a37"; + sha256 = "1pciyrlrp5i9s4s8ai4dvhihcahazva6fg0graxxxkjdvnl789ws"; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e1079f354d1..f305c55dbfa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -58,6 +58,9 @@ rec { ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; }; + ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix { + bootPkgs = packages.ghc801; + }; jhc = callPackage ../development/compilers/jhc { inherit (packages.ghc763) ghcWithPackages; @@ -126,6 +129,10 @@ rec { ghc = compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcjsHEAD = callPackage ../development/haskell-modules { + ghc = compiler.ghcjsHEAD; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; # These attributes exist only for backwards-compatibility so that we don't break # stack's --nix support. These attributes will disappear in the foreseeable From 0018599a26747abc03457cf67c8cbc5d351661a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 08:04:46 +0100 Subject: [PATCH 154/336] haskell-hoogle: use latest version by default --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- pkgs/development/haskell-modules/default.nix | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7a0abf51bbc..3eb5e807ed0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -299,7 +299,6 @@ self: super: { hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; @@ -984,6 +983,9 @@ self: super: { criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # The latest Hoogle needs versions not yet in LTS Haskell 7.x. + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; + # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 0c72173d2d0..673099e0dc4 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -80,7 +80,6 @@ let packages = selectFrom self; hoogle = callPackage ./hoogle.nix { inherit packages; - hoogle = self.hoogle_5_0_4; }; in withPackages (packages ++ [ hoogle ]); From dbeb3f357c18b0b1d8d9536c87e6b894380846a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 08:10:58 +0100 Subject: [PATCH 155/336] haskell-hspec-discover: enable the Haddock documentation again --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3eb5e807ed0..36ca2023285 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -142,7 +142,6 @@ self: super: { HDBC-odbc = dontHaddock super.HDBC-odbc; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - hspec-discover = dontHaddock super.hspec-discover; http-client-conduit = dontHaddock super.http-client-conduit; http-client-multipart = dontHaddock super.http-client-multipart; markdown-unlit = dontHaddock super.markdown-unlit; From b84f2a516501b2f90e5bb89c8125c666ac007858 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 08:30:31 +0100 Subject: [PATCH 156/336] Cosmetic. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 36ca2023285..172cdf3230f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1022,10 +1022,7 @@ self: super: { # https://github.com/fpco/store/issues/77 store = dontCheck super.store; - - store_0_3 = super.store_0_3.overrideScope (self: super: { - store-core = self.store-core_0_3; - }); + store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; }); # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; From 6fe22c643b0fe189ffbd53275952adb0a6d6def1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 08:39:39 +0100 Subject: [PATCH 157/336] haskell-servant: fix build of latest version Closes https://github.com/NixOS/nixpkgs/pull/20068. --- .../haskell-modules/configuration-common.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 172cdf3230f..b190340641b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1017,6 +1017,20 @@ self: super: { doCheck = false; }); + # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version + # is hard because of transitive dependencies, so we just disable tests. + http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2; + + # Fix build for latest versions of servant and servant-client. + servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { + http-api-data = self.http-api-data_0_3_2; + }); + servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { + http-api-data = self.http-api-data_0_3_2; + servant-server = self.servant-server_0_9_1_1; + servant = self.servant_0_9_1_1; + }); + # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; From 4ba3605260e6c8ab33a6481f56ec85c3213eaaad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2016 14:55:16 +0100 Subject: [PATCH 158/336] configuration-hackage2nix.yaml: enable hledger-* test builds Closes https://github.com/NixOS/nixpkgs/issues/20076. --- .../haskell-modules/configuration-hackage2nix.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c55f48f169e..57aeca52bda 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4419,11 +4419,6 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-web: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] From b137b8d1aa14637db1397aaffacf0524d95803e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2016 18:34:46 +0200 Subject: [PATCH 159/336] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ed04e9f186597a5bed7c630afab9a5c63a8a4b13. --- .../haskell-modules/hackage-packages.nix | 3144 ++++++++++++----- 1 file changed, 2274 insertions(+), 870 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 114c40d6179..3555db97d23 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2487,8 +2487,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.8"; - sha256 = "7181289529ba96df4946c2e9018cabf3d8566da1a11a2a7e0f0eb8c39e9e70dc"; + version = "1.8.1"; + sha256 = "635241e4b6b8aa1ddeb244c94002edc21603617fadeaf50aa7f52e28493ba15e"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2504,8 +2504,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.8"; - sha256 = "05cf006424750562dc786cc5eb169474759932c05da6ec08a44b932b72b620ec"; + version = "1.8.1"; + sha256 = "b21494feb055a55674b66d51f0522af9c06094ed86ba62db93fba54179c47c14"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2523,8 +2523,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.8"; - sha256 = "d5c3e7235a98683337dc44127bc19998d747e37fa2d4211f2142ac51a5288558"; + version = "1.8.1"; + sha256 = "1c2e12d7719e6798721a3957e6df6ea772dff0bd7d6900e5a1f5c009cd5635bb"; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers data-default-class diagrams-core diagrams-lib diagrams-postscript @@ -2542,8 +2542,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.8"; - sha256 = "2bf9b59cf417a263cfe29fdc18135c8abfb997d5468e47ccaf9a756afde61aec"; + version = "1.8.1"; + sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2551,6 +2551,7 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -5093,6 +5094,7 @@ self: { homepage = "https://github.com/yuhangwang/Files#readme"; description = "File content extraction/rearrangement"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -10710,8 +10712,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.5.2"; - sha256 = "27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac"; + version = "0.6.0"; + sha256 = "03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "List monad transformer and class"; @@ -10752,6 +10754,7 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListWriter" = callPackage @@ -11909,6 +11912,7 @@ self: { homepage = "http://github.com/pommicket/name-generator-haskell"; description = "A name generator written in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NanoProlog" = callPackage @@ -15044,18 +15048,19 @@ self: { "SciFlow" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, directory - , executable-path, fgl, graphviz, lens, lifted-async, mtl - , optparse-applicative, rainbow, shelly, split, sqlite-simple + , exceptions, executable-path, fgl, graphviz, lens, lifted-async + , mtl, optparse-applicative, rainbow, shelly, split, sqlite-simple , template-haskell, text, th-lift, transformers, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.5.1"; - sha256 = "bbd6d78dae17138dcd6e9849c156402bf1e65b71cc6bbfe3ca6bc64acc99422d"; + version = "0.5.3.1"; + sha256 = "8d8408047e57b245ea66577ded733244959c507ff1e2d014b3d3d9cfd66fdbf0"; libraryHaskellDepends = [ - base bytestring cereal containers directory executable-path fgl - graphviz lens lifted-async mtl optparse-applicative rainbow shelly - split sqlite-simple template-haskell text th-lift transformers yaml + base bytestring cereal containers directory exceptions + executable-path fgl graphviz lens lifted-async mtl + optparse-applicative rainbow shelly split sqlite-simple + template-haskell text th-lift transformers yaml ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; @@ -15172,31 +15177,6 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, base, containers, directory, json, mtl, parsec - , process, QuickCheck, regex-tdfa - }: - mkDerivation { - pname = "ShellCheck"; - version = "0.4.4"; - sha256 = "6cc50790d25b6f330037c3612c21460aa75839cc32c65e10ea6b35f9f4488768"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory json mtl parsec process QuickCheck - regex-tdfa - ]; - executableHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa - ]; - testHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa - ]; - homepage = "http://www.shellcheck.net/"; - description = "Shell script analysis tool"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "ShellCheck_0_4_5" = callPackage ({ mkDerivation, base, containers, directory, json, mtl, parsec , process, QuickCheck, regex-tdfa }: @@ -15219,7 +15199,6 @@ self: { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Shellac" = callPackage @@ -21010,6 +20989,7 @@ self: { ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -21611,7 +21591,7 @@ self: { license = "unknown"; }) {}; - "amazonka_1_4_4_1" = callPackage + "amazonka_1_4_4_2" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -21619,8 +21599,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.4.4.1"; - sha256 = "0c0937d745ad39d34e1e6588497311721e4c7f995d0beab313def44893e47ede"; + version = "1.4.4.2"; + sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -23082,6 +23062,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -23433,6 +23414,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -23933,6 +23915,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -23988,6 +23971,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -24272,7 +24256,7 @@ self: { license = "unknown"; }) {}; - "amazonka-test_1_4_4" = callPackage + "amazonka-test_1_4_4_2" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -24281,8 +24265,8 @@ self: { }: mkDerivation { pname = "amazonka-test"; - version = "1.4.4"; - sha256 = "5491b4cc27f41dd85daacaab0cc5e6b8630c5bb1581e3997f65d0b7b2ef6e5f0"; + version = "1.4.4.2"; + sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46"; libraryHaskellDepends = [ aeson amazonka-core base bifunctors bytestring case-insensitive conduit conduit-extra groom http-client http-types process @@ -26672,29 +26656,6 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative - , rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.1.2"; - sha256 = "dafcfba0d75da40e33bc3270b25c8cdd48f1cf07cc64d21f8eac4024d7ddddba"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asciidiagram_1_3_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector @@ -26715,7 +26676,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -27956,6 +27916,7 @@ self: { homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata"; description = "Generates and displays patterns from next nearest neighbors cellular automata"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "automitive-cse" = callPackage @@ -28095,18 +28056,18 @@ self: { "avers" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, clock, containers, cryptohash, filepath, hspec - , inflections, MonadRandom, mtl, network, network-uri - , resource-pool, rethinkdb-client-driver, safe, scrypt, stm - , template-haskell, text, time, unordered-containers, vector + , bytestring, clock, containers, cryptohash, cryptonite, filepath + , hspec, inflections, memory, MonadRandom, mtl, network + , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt + , stm, template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "avers"; - version = "0.0.16"; - sha256 = "04221c75c07aa82789ce79674a0ba5add253855087fd42c123f1d77fb94f1c85"; + version = "0.0.17.0"; + sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash filepath inflections MonadRandom mtl network network-uri + aeson attoparsec base bytestring clock containers cryptonite + filepath inflections memory MonadRandom mtl network network-uri resource-pool rethinkdb-client-driver safe scrypt stm template-haskell text time unordered-containers vector ]; @@ -28127,8 +28088,8 @@ self: { }: mkDerivation { pname = "avers-api"; - version = "0.0.5"; - sha256 = "469fa007854e5836e816cdf66d650f7b89601dd9644cf859ff680bb6b69d124c"; + version = "0.0.17.0"; + sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -28139,21 +28100,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avers-api-docs" = callPackage + ({ mkDerivation, aeson, avers, avers-api, base, cookie, lens + , servant, servant-swagger, swagger2, text, unordered-containers + }: + mkDerivation { + pname = "avers-api-docs"; + version = "0.0.17.0"; + sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f"; + libraryHaskellDepends = [ + aeson avers avers-api base cookie lens servant servant-swagger + swagger2 text unordered-containers + ]; + homepage = "http://github.com/wereHamster/avers-api-docs"; + description = "Swagger documentation for the Avers API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avers-server" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring - , bytestring, bytestring-conversion, containers, cookie, cryptohash - , either, http-types, mtl, resource-pool, rethinkdb-client-driver - , servant, servant-server, stm, text, time, transformers, wai - , wai-websockets, websockets + , bytestring, bytestring-conversion, containers, cookie, cryptonite + , either, http-types, memory, mtl, resource-pool + , rethinkdb-client-driver, servant, servant-server, stm, text, time + , transformers, wai, wai-websockets, websockets }: mkDerivation { pname = "avers-server"; - version = "0.0.5"; - sha256 = "c72bd19a4f46c733875c887a0efcc7340f9c5b4571a5f74773d3d835297b2176"; + version = "0.0.17.0"; + sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring - bytestring-conversion containers cookie cryptohash either - http-types mtl resource-pool rethinkdb-client-driver servant + bytestring-conversion containers cookie cryptonite either + http-types memory mtl resource-pool rethinkdb-client-driver servant servant-server stm text time transformers wai wai-websockets websockets ]; @@ -28743,6 +28722,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "axiomatic-classes" = callPackage + ({ mkDerivation, base, containers, control-invariants, lens + , monad-loops, mtl, portable-template-haskell-lens, QuickCheck + , quickcheck-report, semigroups, template-haskell, th-printf + , transformers + }: + mkDerivation { + pname = "axiomatic-classes"; + version = "0.1.0.0"; + sha256 = "d0ca9598451c66a2070a33fea29a7479acd9f742455c95b3fbfd0005375e0929"; + libraryHaskellDepends = [ + base containers control-invariants lens monad-loops mtl + portable-template-haskell-lens QuickCheck quickcheck-report + semigroups template-haskell th-printf transformers + ]; + description = "Specify axioms for type classes and quickCheck all available instances"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {control-invariants = null;}; + "azure-acs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, connection, http-conduit, http-types, network @@ -32030,33 +32029,26 @@ self: { }) {}; "bioinformatics-toolkit" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring - , bytestring-lexing, case-insensitive, clustering, colour, conduit + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , bytestring-lexing, case-insensitive, clustering, conduit , conduit-combinators, containers, data-default-class - , double-conversion, hexpat, http-conduit, IntervalMap - , math-functions, matrices, mtl, optparse-applicative, palette - , parallel, primitive, random, shelly, split, statistics, tasty - , tasty-golden, tasty-hunit, text, transformers + , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap + , math-functions, matrices, mtl, parallel, primitive, random, split + , statistics, tasty, tasty-golden, tasty-hunit, text, transformers , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.2.4"; - sha256 = "e9ef7a074e8d7fd0d6fb7270f18010dd3d61c69bb06f421acf0930010181a25c"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "f453503831f8a495bcc39e6fe3275f26bd2d50916b09415551b41a316998d543"; libraryHaskellDepends = [ - aeson aeson-pretty base binary bytestring bytestring-lexing - case-insensitive clustering colour conduit-combinators containers - data-default-class double-conversion hexpat http-conduit - IntervalMap math-functions matrices mtl palette parallel primitive - split statistics text transformers unordered-containers vector + aeson aeson-pretty base bytestring bytestring-lexing + case-insensitive clustering conduit-combinators containers + data-default-class double-conversion hexpat HsHTSLib http-conduit + IntervalMap math-functions matrices mtl parallel primitive split + statistics text transformers unordered-containers vector vector-algorithms word8 ]; - executableHaskellDepends = [ - base bytestring clustering data-default-class double-conversion - optparse-applicative shelly split text - ]; testHaskellDepends = [ base bytestring conduit conduit-combinators data-default-class matrices mtl random tasty tasty-golden tasty-hunit @@ -34309,8 +34301,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.11"; - sha256 = "783192383bf8c2887a5b99aca4c8ec48a6ba91f3ee11591a7d8d98734eead2a5"; + version = "0.13"; + sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34898,8 +34890,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.2.2.0"; - sha256 = "f1a00142d77643a3da1ddabf9d9f1308e7ee1d8ea758d8161ed118a3d7c4123a"; + version = "0.2.3.0"; + sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c"; libraryHaskellDepends = [ ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers @@ -36634,8 +36626,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.3.0"; - sha256 = "fe895ad001228f56b167ab76de1d645f46966062544bf831b0fb9fa7e938ff08"; + version = "0.13.3.1"; + sha256 = "a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring mtl text utf8-string @@ -37621,8 +37613,8 @@ self: { }: mkDerivation { pname = "casr-logbook-html"; - version = "0.0.2"; - sha256 = "0a9cadd97d0b821a78e262b858b6ab650c7e72274d640ec8d6c8806f9aa090bd"; + version = "0.0.3"; + sha256 = "3eb3cd24aa8ec50bc83a3e0e1b0864050d7d3e7d601a67c033ae88be362494bb"; libraryHaskellDepends = [ base casr-logbook-types digit lens lucid text time ]; @@ -38123,6 +38115,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cayley-client_0_2_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.2.1.0"; + sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -39205,6 +39218,7 @@ self: { homepage = "https://github.com/marcusbuffett/chitauri"; description = "Helper for the Major System"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "choose" = callPackage @@ -39371,8 +39385,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.1.0"; - sha256 = "ce21a30d63f79e8885ff45248b7578a8d02ce7ed562a7f3cebb302be64d092b3"; + version = "0.2.0"; + sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -39381,7 +39395,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/chronos#readme"; - description = "Initial project template from stack"; + description = "A time library, encoding, decoding, and instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41640,6 +41654,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cold-widow" = callPackage + ({ mkDerivation, base, bytestring, hspec }: + mkDerivation { + pname = "cold-widow"; + version = "0.1.2"; + sha256 = "2452aff29af68c8c093ebf492e5e6598a90bac3be64f48c081864dd7c02515e4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/mihaigiurgeanu/cold-widow#readme"; + description = "File transfer via QR Codes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "collada-output" = callPackage ({ mkDerivation, base, collada-types, containers, SVGPath, time , vector, xml @@ -41772,6 +41802,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "color-counter" = callPackage @@ -42930,8 +42961,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-split"; - version = "0.0.0.1"; - sha256 = "4b7f4a40bc8dbbd3437f460a2eabe78fed84c900ca2912e523b281c311e03177"; + version = "0.0.0.2"; + sha256 = "d3ceb9e47a1fb94a797bcc393bd665c37ac5a8232dc14e421c3cc38ec219e5ed"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -43622,8 +43653,8 @@ self: { }: mkDerivation { pname = "configurator-ng"; - version = "0.0.0.0"; - sha256 = "4995a132a0fcbf80c47198daab2530dd09ff87f227b265354236e188d8ec8aa5"; + version = "0.0.0.1"; + sha256 = "3a367ad5dd04bddb891600899b99cbefa4bb53e44c83ebab114dacd1b68f012b"; libraryHaskellDepends = [ attoparsec base bytestring critbit data-ordlist directory dlist fail hashable scientific text unix-compat unordered-containers @@ -47397,6 +47428,7 @@ self: { homepage = "https://github.com/mgattozzi/curryrs#readme"; description = "Easy to use FFI Bridge for using Rust in Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cursedcsv" = callPackage @@ -49995,6 +50027,7 @@ self: { ]; description = "The dbmigrations tool built for MySQL databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-postgresql" = callPackage @@ -50013,6 +50046,7 @@ self: { ]; description = "The dbmigrations tool built for PostgreSQL databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-sqlite" = callPackage @@ -50643,8 +50677,8 @@ self: { }: mkDerivation { pname = "declarative"; - version = "0.2.2"; - sha256 = "2201fb8299231ad5017a4ebf429d5036f7d3950df8cf3e684173fa7d658cac8e"; + version = "0.2.3"; + sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa"; libraryHaskellDepends = [ base hasty-hamiltonian lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice transformers @@ -51908,6 +51942,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -52907,8 +52942,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.1.0"; - sha256 = "3c2bba9783279cb52d7fdbd03f0cea46b6f2c23f788953016568cd8f0a389c8a"; + version = "0.8.1.1"; + sha256 = "3c42b7b8b89369d305621a7753c245a6250deb58bc848dd3d757e06d69f842a8"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -52952,8 +52987,8 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.0.6"; - sha256 = "b11b6c0268a31353b915894452d0a78162e0ead933baeb4e6e49b384b869a8cf"; + version = "0.6.1.0"; + sha256 = "4be758620386fc395367b15b81b9fb7373e5ee370ab9af52fa03b2c24c579f0d"; libraryHaskellDepends = [ base blaze-html blaze-markup digestive-functors text ]; @@ -53376,6 +53411,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_18" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.18"; + sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -55070,6 +55123,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "download_0_3_2_5" = callPackage + ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: + mkDerivation { + pname = "download"; + version = "0.3.2.5"; + sha256 = "9ae6d92ae4fe7ec4ff7281896254a7794e4caf85b6743280afd2074865dd99c0"; + libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/psibi/download"; + description = "High-level file download based on URLs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "download-curl" = callPackage ({ mkDerivation, base, bytestring, curl, feed, tagsoup, xml }: mkDerivation { @@ -58947,6 +59014,7 @@ self: { homepage = "https://github.com/EarthCitizen/escape-artist#readme"; description = "ANSI Escape Sequence Text Decoration Made Easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "esotericbot" = callPackage @@ -59842,20 +59910,26 @@ self: { }) {}; "existential" = callPackage - ({ mkDerivation, base, lens, QuickCheck, template-haskell }: + ({ mkDerivation, base, cereal, constraints, control-invariants + , lens, portable-template-haskell-lens, QuickCheck + , quickcheck-report, serialize-instances, tagged, template-haskell + , th-printf, unordered-containers + }: mkDerivation { pname = "existential"; - version = "0.1.0.0"; - sha256 = "1aea3b930ba0343fb9f3d8bef2d96dde79b9fb353ce80b6a93c9d99599c6b46a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base lens QuickCheck template-haskell ]; - executableHaskellDepends = [ base lens ]; - homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home"; - description = "A library for existential types"; + version = "0.2.0.0"; + sha256 = "756bf090bdf84aae4ffb8f3f7ceefe95eb772853d71edc369dd789d9fde6136e"; + libraryHaskellDepends = [ + base cereal constraints control-invariants lens + portable-template-haskell-lens QuickCheck quickcheck-report + serialize-instances tagged template-haskell th-printf + unordered-containers + ]; + description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {control-invariants = null;}; "exists" = callPackage ({ mkDerivation, base, contravariant }: @@ -61052,12 +61126,13 @@ self: { ({ mkDerivation, fay-base }: mkDerivation { pname = "fay-simplejson"; - version = "0.1.1.0"; - sha256 = "78dbb8ad24149e93706d3630d5c9dcab9b263c0614e437eb14a6983953833c04"; + version = "0.1.3.0"; + sha256 = "b8d711a62c40b587b9266eef199ad83e2f0403c5883a8e1c75f5dc34e8368033"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/Lupino/fay-simplejson"; description = "SimpleJSON library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -61423,8 +61498,8 @@ self: { }: mkDerivation { pname = "feed-gipeda"; - version = "0.3.0.0"; - sha256 = "8a440f45d32a3eb0db3785b20601bd3031560da5776569d4c20762de3c44a98d"; + version = "0.3.0.1"; + sha256 = "5fa85807a74e5759635106deef4509e807d42f61d108d91645fe9cd0fec7a8cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64070,6 +64145,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_2_3" = callPackage + ({ mkDerivation, base, clock, old-locale, scientific, text + , text-format, time + }: + mkDerivation { + pname = "formatting"; + version = "6.2.3"; + sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc"; + libraryHaskellDepends = [ + base clock old-locale scientific text text-format time + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -65075,12 +65166,12 @@ self: { }) {}; "from-sum" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base, doctest, Glob, mtl }: mkDerivation { pname = "from-sum"; - version = "0.1.2.0"; - sha256 = "29449f195710ecdc601375ad0f853666bb93baf11f279b6f9f31783455cc51d9"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4"; + libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/from-sum"; description = "Canonical fromMaybeM and fromEitherM functions"; @@ -67708,6 +67799,8 @@ self: { pname = "ghc-mod"; version = "5.6.0.0"; sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; + revision = "3"; + editedCabalFile = "d21d034e1e1df7a5b478e2fd8dad0e11e01e46ce095ea39a90acacfdd34661ea"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -69366,8 +69459,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.5.0"; - sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe"; + version = "0.3.5.3"; + sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69419,8 +69512,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.3.0"; - sha256 = "f20d17c56ee29cdd102234c00be1cdf0e5c12b7abe6c0a9723668a6f72a57417"; + version = "0.13.3.1"; + sha256 = "ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring containers glib mtl @@ -69589,8 +69682,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161027"; - sha256 = "1e4d859434d5175bbe29843e3be03350e7412063bc340d12a1e31e04c80791cf"; + version = "6.20161031"; + sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -69913,17 +70006,17 @@ self: { }) {}; "gitcache" = callPackage - ({ mkDerivation, base, cryptohash, directory, filepath, process + ({ mkDerivation, base, cryptonite, directory, filepath, process , utf8-string }: mkDerivation { pname = "gitcache"; - version = "0.2"; - sha256 = "fe69fd3f8ec4bff1dfb85d67279d71161c6cf6e6f05fe93df33776162640a56d"; + version = "0.3"; + sha256 = "52d2a4243eb1a385bee7665259efbba41a33e1ad57e59c59912b56d469a21e5d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cryptohash directory filepath process utf8-string + base cryptonite directory filepath process utf8-string ]; homepage = "https://github.com/vincenthz/gitcache"; description = "Simple git utility to use and manage clone cache"; @@ -70103,8 +70196,8 @@ self: { }: mkDerivation { pname = "github-webhook-handler-snap"; - version = "0.0.6"; - sha256 = "ec62b61aeb429492b347ed327b14a4c1bcf44d3791ac61ee6989f8a0a608a80e"; + version = "0.0.7"; + sha256 = "d4f526f4027a0c1cd9bdf455fbfb0c1742539eb3379b22ba59f1647133202c91"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid @@ -70563,8 +70656,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.4.0"; - sha256 = "8bbc24b8a7f4de0fc02d60f12bf1b5154a151ffcad25964b65e958977100a0d9"; + version = "0.13.4.1"; + sha256 = "f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -70683,6 +70776,7 @@ self: { homepage = "https://github.com/rdnetto/glob-posix#readme"; description = "Haskell bindings for POSIX glob library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "global" = callPackage @@ -71215,8 +71309,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.17"; - sha256 = "4f40d2896ac66c3a42daaa8849639e4a98bc8152c1d28933a6aaaceb8679dfe6"; + version = "0.1.18"; + sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71462,6 +71556,31 @@ self: { license = "unknown"; }) {}; + "gogol_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, directory, exceptions, filepath + , gogol-core, http-client, http-conduit, http-media, http-types + , lens, memory, mime-types, monad-control, mtl, resourcet, text + , time, transformers, transformers-base, unordered-containers, x509 + , x509-store + }: + mkDerivation { + pname = "gogol"; + version = "0.1.1"; + sha256 = "1dee6d069d6c239c8afa2240bdfc4e9674e9e648822617574732e4dc74834db2"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite directory exceptions filepath gogol-core http-client + http-conduit http-media http-types lens memory mime-types + monad-control mtl resourcet text time transformers + transformers-base unordered-containers x509 x509-store + ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Comprehensive Google Services SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adexchange-buyer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71474,6 +71593,19 @@ self: { license = "unknown"; }) {}; + "gogol-adexchange-buyer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adexchange-buyer"; + version = "0.1.1"; + sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Ad Exchange Buyer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adexchange-seller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71486,6 +71618,19 @@ self: { license = "unknown"; }) {}; + "gogol-adexchange-seller_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adexchange-seller"; + version = "0.1.1"; + sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Ad Exchange Seller SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-datatransfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71498,6 +71643,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-datatransfer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-datatransfer"; + version = "0.1.1"; + sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Data Transfer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-directory" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71510,6 +71668,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-directory_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-directory"; + version = "0.1.1"; + sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Directory SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-emailmigration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71522,6 +71693,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-emailmigration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-emailmigration"; + version = "0.1.1"; + sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Email Migration API v2 SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-reports" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71534,6 +71718,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-reports_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-reports"; + version = "0.1.1"; + sha256 = "5621ea9daeb864dcd0c5bb576645bbf5b6726da2e9313cd6b2514c7e2e394ccd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Reports SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adsense" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71546,6 +71743,19 @@ self: { license = "unknown"; }) {}; + "gogol-adsense_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adsense"; + version = "0.1.1"; + sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google AdSense Management SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adsense-host" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71558,6 +71768,19 @@ self: { license = "unknown"; }) {}; + "gogol-adsense-host_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adsense-host"; + version = "0.1.1"; + sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google AdSense Host SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-affiliates" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71570,6 +71793,19 @@ self: { license = "unknown"; }) {}; + "gogol-affiliates_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-affiliates"; + version = "0.1.1"; + sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Affiliate Network SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71582,6 +71818,19 @@ self: { license = "unknown"; }) {}; + "gogol-analytics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-analytics"; + version = "0.1.1"; + sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Analytics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-android-enterprise" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71594,6 +71843,19 @@ self: { license = "unknown"; }) {}; + "gogol-android-enterprise_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-android-enterprise"; + version = "0.1.1"; + sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play EMM SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-android-publisher" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71606,6 +71868,19 @@ self: { license = "unknown"; }) {}; + "gogol-android-publisher_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-android-publisher"; + version = "0.1.1"; + sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Developer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-appengine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71618,6 +71893,19 @@ self: { license = "unknown"; }) {}; + "gogol-appengine_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-appengine"; + version = "0.1.1"; + sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google App Engine Admin SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-activity" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71630,6 +71918,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-activity_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-activity"; + version = "0.1.1"; + sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Apps Activity SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-calendar" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71642,6 +71943,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-calendar_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-calendar"; + version = "0.1.1"; + sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Calendar SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-licensing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71654,6 +71968,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-licensing_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-licensing"; + version = "0.1.1"; + sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Enterprise License Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-reseller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71666,6 +71993,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-reseller_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-reseller"; + version = "0.1.1"; + sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Enterprise Apps Reseller SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-tasks" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71678,6 +72018,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-tasks_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-tasks"; + version = "0.1.1"; + sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Tasks SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-appstate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71690,6 +72043,19 @@ self: { license = "unknown"; }) {}; + "gogol-appstate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-appstate"; + version = "0.1.1"; + sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google App State SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-autoscaler" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71702,6 +72068,19 @@ self: { license = "unknown"; }) {}; + "gogol-autoscaler_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-autoscaler"; + version = "0.1.1"; + sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Autoscaler SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-bigquery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71714,6 +72093,19 @@ self: { license = "unknown"; }) {}; + "gogol-bigquery_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-bigquery"; + version = "0.1.1"; + sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google BigQuery SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-billing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71726,6 +72118,19 @@ self: { license = "unknown"; }) {}; + "gogol-billing_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-billing"; + version = "0.1.1"; + sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Billing SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-blogger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71738,6 +72143,19 @@ self: { license = "unknown"; }) {}; + "gogol-blogger_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-blogger"; + version = "0.1.1"; + sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Blogger SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-books" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71750,6 +72168,19 @@ self: { license = "unknown"; }) {}; + "gogol-books_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-books"; + version = "0.1.1"; + sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Books SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-civicinfo" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71762,6 +72193,19 @@ self: { license = "unknown"; }) {}; + "gogol-civicinfo_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-civicinfo"; + version = "0.1.1"; + sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Civic Information SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-classroom" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71774,6 +72218,19 @@ self: { license = "unknown"; }) {}; + "gogol-classroom_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-classroom"; + version = "0.1.1"; + sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Classroom SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-cloudmonitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71786,6 +72243,19 @@ self: { license = "unknown"; }) {}; + "gogol-cloudmonitoring_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudmonitoring"; + version = "0.1.1"; + sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-cloudtrace" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71798,6 +72268,19 @@ self: { license = "unknown"; }) {}; + "gogol-cloudtrace_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudtrace"; + version = "0.1.1"; + sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Trace SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-compute" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71810,6 +72293,19 @@ self: { license = "unknown"; }) {}; + "gogol-compute_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-compute"; + version = "0.1.1"; + sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-container" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71822,6 +72318,31 @@ self: { license = "unknown"; }) {}; + "gogol-container_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-container"; + version = "0.1.1"; + sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Container Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-containerbuilder" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-containerbuilder"; + version = "0.1.1"; + sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Container Builder SDK"; + license = "unknown"; + }) {}; + "gogol-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable @@ -71847,6 +72368,30 @@ self: { license = "unknown"; }) {}; + "gogol-core_0_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , case-insensitive, conduit, dlist, exceptions, hashable + , http-api-data, http-client, http-media, http-types, lens, memory + , resourcet, scientific, servant, tasty, text, time + , unordered-containers + }: + mkDerivation { + pname = "gogol-core"; + version = "0.1.1"; + sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring case-insensitive + conduit dlist exceptions hashable http-api-data http-client + http-media http-types lens memory resourcet scientific servant text + time unordered-containers + ]; + testHaskellDepends = [ base tasty ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Core data types and functionality for Gogol libraries"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-customsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71859,6 +72404,19 @@ self: { license = "unknown"; }) {}; + "gogol-customsearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-customsearch"; + version = "0.1.1"; + sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google CustomSearch SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dataflow" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71871,6 +72429,19 @@ self: { license = "unknown"; }) {}; + "gogol-dataflow_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dataflow"; + version = "0.1.1"; + sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Dataflow SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dataproc" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71883,6 +72454,19 @@ self: { license = "unknown"; }) {}; + "gogol-dataproc_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dataproc"; + version = "0.1.1"; + sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Dataproc SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-datastore" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71895,6 +72479,19 @@ self: { license = "unknown"; }) {}; + "gogol-datastore_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-datastore"; + version = "0.1.1"; + sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Datastore SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-debugger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71907,6 +72504,19 @@ self: { license = "unknown"; }) {}; + "gogol-debugger_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-debugger"; + version = "0.1.1"; + sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Debugger SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-deploymentmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71919,6 +72529,19 @@ self: { license = "unknown"; }) {}; + "gogol-deploymentmanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-deploymentmanager"; + version = "0.1.1"; + sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Deployment Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dfareporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71931,6 +72554,19 @@ self: { license = "unknown"; }) {}; + "gogol-dfareporting_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dfareporting"; + version = "0.1.1"; + sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DCM/DFA Reporting And Trafficking SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-discovery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71943,6 +72579,19 @@ self: { license = "unknown"; }) {}; + "gogol-discovery_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-discovery"; + version = "0.1.1"; + sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google APIs Discovery Service SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dns" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71955,6 +72604,19 @@ self: { license = "unknown"; }) {}; + "gogol-dns_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dns"; + version = "0.1.1"; + sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud DNS SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-doubleclick-bids" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71967,6 +72629,19 @@ self: { license = "unknown"; }) {}; + "gogol-doubleclick-bids_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-doubleclick-bids"; + version = "0.1.1"; + sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DoubleClick Bid Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-doubleclick-search" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71979,6 +72654,19 @@ self: { license = "unknown"; }) {}; + "gogol-doubleclick-search_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-doubleclick-search"; + version = "0.1.1"; + sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DoubleClick Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-drive" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71991,6 +72679,31 @@ self: { license = "unknown"; }) {}; + "gogol-drive_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-drive"; + version = "0.1.1"; + sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Drive SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-firebase-dynamiclinks" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-firebase-dynamiclinks"; + version = "0.1.1"; + sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Firebase Dynamic Links SDK"; + license = "unknown"; + }) {}; + "gogol-firebase-rules" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72003,6 +72716,19 @@ self: { license = "unknown"; }) {}; + "gogol-firebase-rules_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-firebase-rules"; + version = "0.1.1"; + sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Firebase Rules SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fitness" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72015,6 +72741,19 @@ self: { license = "unknown"; }) {}; + "gogol-fitness_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fitness"; + version = "0.1.1"; + sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fitness SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fonts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72027,6 +72766,19 @@ self: { license = "unknown"; }) {}; + "gogol-fonts_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fonts"; + version = "0.1.1"; + sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fonts Developer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-freebasesearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72039,6 +72791,19 @@ self: { license = "unknown"; }) {}; + "gogol-freebasesearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-freebasesearch"; + version = "0.1.1"; + sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Freebase Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fusiontables" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72051,6 +72816,19 @@ self: { license = "unknown"; }) {}; + "gogol-fusiontables_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fusiontables"; + version = "0.1.1"; + sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fusion Tables SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72063,6 +72841,19 @@ self: { license = "unknown"; }) {}; + "gogol-games_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games"; + version = "0.1.1"; + sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games-configuration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72075,6 +72866,19 @@ self: { license = "unknown"; }) {}; + "gogol-games-configuration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games-configuration"; + version = "0.1.1"; + sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services Publishing SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games-management" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72087,6 +72891,19 @@ self: { license = "unknown"; }) {}; + "gogol-games-management_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games-management"; + version = "0.1.1"; + sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services Management SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-genomics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72099,6 +72916,19 @@ self: { license = "unknown"; }) {}; + "gogol-genomics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-genomics"; + version = "0.1.1"; + sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Genomics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-gmail" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72111,6 +72941,19 @@ self: { license = "unknown"; }) {}; + "gogol-gmail_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-gmail"; + version = "0.1.1"; + sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Gmail SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-groups-migration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72123,6 +72966,19 @@ self: { license = "unknown"; }) {}; + "gogol-groups-migration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-groups-migration"; + version = "0.1.1"; + sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Groups Migration SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-groups-settings" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72135,6 +72991,31 @@ self: { license = "unknown"; }) {}; + "gogol-groups-settings_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-groups-settings"; + version = "0.1.1"; + sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Groups Settings SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-iam" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-iam"; + version = "0.1.1"; + sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Identity and Access Management (IAM) SDK"; + license = "unknown"; + }) {}; + "gogol-identity-toolkit" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72147,6 +73028,19 @@ self: { license = "unknown"; }) {}; + "gogol-identity-toolkit_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-identity-toolkit"; + version = "0.1.1"; + sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Identity Toolkit SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-kgsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72159,6 +73053,19 @@ self: { license = "unknown"; }) {}; + "gogol-kgsearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-kgsearch"; + version = "0.1.1"; + sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Knowledge Graph Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-latencytest" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72171,6 +73078,19 @@ self: { license = "unknown"; }) {}; + "gogol-latencytest_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-latencytest"; + version = "0.1.1"; + sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Network Performance Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-logging" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72183,6 +73103,19 @@ self: { license = "unknown"; }) {}; + "gogol-logging_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-logging"; + version = "0.1.1"; + sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Logging SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-maps-coordinate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72195,6 +73128,19 @@ self: { license = "unknown"; }) {}; + "gogol-maps-coordinate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-maps-coordinate"; + version = "0.1.1"; + sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Maps Coordinate SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-maps-engine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72207,6 +73153,19 @@ self: { license = "unknown"; }) {}; + "gogol-maps-engine_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-maps-engine"; + version = "0.1.1"; + sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Maps Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-mirror" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72219,6 +73178,31 @@ self: { license = "unknown"; }) {}; + "gogol-mirror_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-mirror"; + version = "0.1.1"; + sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Mirror SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-ml" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-ml"; + version = "0.1.1"; + sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Machine Learning SDK"; + license = "unknown"; + }) {}; + "gogol-monitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72231,6 +73215,19 @@ self: { license = "unknown"; }) {}; + "gogol-monitoring_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-monitoring"; + version = "0.1.1"; + sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-oauth2" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72243,6 +73240,19 @@ self: { license = "unknown"; }) {}; + "gogol-oauth2_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-oauth2"; + version = "0.1.1"; + sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google OAuth2 SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-pagespeed" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72255,6 +73265,19 @@ self: { license = "unknown"; }) {}; + "gogol-pagespeed_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-pagespeed"; + version = "0.1.1"; + sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google PageSpeed Insights SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-partners" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72267,6 +73290,19 @@ self: { license = "unknown"; }) {}; + "gogol-partners_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-partners"; + version = "0.1.1"; + sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Partners SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-people" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72279,6 +73315,19 @@ self: { license = "unknown"; }) {}; + "gogol-people_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-people"; + version = "0.1.1"; + sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google People SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-play-moviespartner" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72291,6 +73340,19 @@ self: { license = "unknown"; }) {}; + "gogol-play-moviespartner_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-play-moviespartner"; + version = "0.1.1"; + sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Movies Partner SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-plus" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72303,6 +73365,19 @@ self: { license = "unknown"; }) {}; + "gogol-plus_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-plus"; + version = "0.1.1"; + sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google + SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-plus-domains" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72315,6 +73390,19 @@ self: { license = "unknown"; }) {}; + "gogol-plus-domains_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-plus-domains"; + version = "0.1.1"; + sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google + Domains SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-prediction" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72327,6 +73415,19 @@ self: { license = "unknown"; }) {}; + "gogol-prediction_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-prediction"; + version = "0.1.1"; + sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Prediction SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-proximitybeacon" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72339,6 +73440,19 @@ self: { license = "unknown"; }) {}; + "gogol-proximitybeacon_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-proximitybeacon"; + version = "0.1.1"; + sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Proximity Beacon SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-pubsub" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72351,6 +73465,19 @@ self: { license = "unknown"; }) {}; + "gogol-pubsub_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-pubsub"; + version = "0.1.1"; + sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Pub/Sub SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-qpxexpress" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72363,6 +73490,19 @@ self: { license = "unknown"; }) {}; + "gogol-qpxexpress_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-qpxexpress"; + version = "0.1.1"; + sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google QPX Express SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-replicapool" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72375,6 +73515,19 @@ self: { license = "unknown"; }) {}; + "gogol-replicapool_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-replicapool"; + version = "0.1.1"; + sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Group Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-replicapool-updater" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72387,6 +73540,19 @@ self: { license = "unknown"; }) {}; + "gogol-replicapool-updater_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-replicapool-updater"; + version = "0.1.1"; + sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Group Updater SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-resourcemanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72399,6 +73565,19 @@ self: { license = "unknown"; }) {}; + "gogol-resourcemanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-resourcemanager"; + version = "0.1.1"; + sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Resource Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-resourceviews" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72411,6 +73590,43 @@ self: { license = "unknown"; }) {}; + "gogol-resourceviews_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-resourceviews"; + version = "0.1.1"; + sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Groups SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-runtimeconfig" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-runtimeconfig"; + version = "0.1.1"; + sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud RuntimeConfig SDK"; + license = "unknown"; + }) {}; + + "gogol-safebrowsing" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-safebrowsing"; + version = "0.1.1"; + sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Safe Browsing APIs SDK"; + license = "unknown"; + }) {}; + "gogol-script" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72423,6 +73639,43 @@ self: { license = "unknown"; }) {}; + "gogol-script_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-script"; + version = "0.1.1"; + sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Apps Script Execution SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-servicecontrol" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-servicecontrol"; + version = "0.1.1"; + sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Service Control SDK"; + license = "unknown"; + }) {}; + + "gogol-servicemanagement" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-servicemanagement"; + version = "0.1.1"; + sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Service Management SDK"; + license = "unknown"; + }) {}; + "gogol-sheets" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72435,6 +73688,19 @@ self: { license = "unknown"; }) {}; + "gogol-sheets_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-sheets"; + version = "0.1.1"; + sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Sheets SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-shopping-content" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72447,6 +73713,19 @@ self: { license = "unknown"; }) {}; + "gogol-shopping-content_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-shopping-content"; + version = "0.1.1"; + sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Content API for Shopping SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-siteverification" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72459,6 +73738,19 @@ self: { license = "unknown"; }) {}; + "gogol-siteverification_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-siteverification"; + version = "0.1.1"; + sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Site Verification SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-spectrum" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72471,6 +73763,19 @@ self: { license = "unknown"; }) {}; + "gogol-spectrum_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-spectrum"; + version = "0.1.1"; + sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Spectrum Database SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-sqladmin" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72483,6 +73788,19 @@ self: { license = "unknown"; }) {}; + "gogol-sqladmin_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-sqladmin"; + version = "0.1.1"; + sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud SQL Administration SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-storage" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72495,6 +73813,19 @@ self: { license = "unknown"; }) {}; + "gogol-storage_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-storage"; + version = "0.1.1"; + sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Storage JSON SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-storage-transfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72507,6 +73838,19 @@ self: { license = "unknown"; }) {}; + "gogol-storage-transfer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-storage-transfer"; + version = "0.1.1"; + sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Storage Transfer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-tagmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72519,6 +73863,19 @@ self: { license = "unknown"; }) {}; + "gogol-tagmanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-tagmanager"; + version = "0.1.1"; + sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Tag Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-taskqueue" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72531,6 +73888,19 @@ self: { license = "unknown"; }) {}; + "gogol-taskqueue_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-taskqueue"; + version = "0.1.1"; + sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google TaskQueue SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-translate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72543,6 +73913,19 @@ self: { license = "unknown"; }) {}; + "gogol-translate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-translate"; + version = "0.1.1"; + sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Translate SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-urlshortener" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72555,6 +73938,19 @@ self: { license = "unknown"; }) {}; + "gogol-urlshortener_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-urlshortener"; + version = "0.1.1"; + sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google URL Shortener SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-useraccounts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72567,6 +73963,19 @@ self: { license = "unknown"; }) {}; + "gogol-useraccounts_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-useraccounts"; + version = "0.1.1"; + sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud User Accounts SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-vision" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72579,6 +73988,19 @@ self: { license = "unknown"; }) {}; + "gogol-vision_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-vision"; + version = "0.1.1"; + sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Vision SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-webmaster-tools" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72591,6 +74013,19 @@ self: { license = "unknown"; }) {}; + "gogol-webmaster-tools_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-webmaster-tools"; + version = "0.1.1"; + sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Search Console SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72603,6 +74038,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube"; + version = "0.1.1"; + sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Data SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72615,6 +74063,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube-analytics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube-analytics"; + version = "0.1.1"; + sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Analytics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube-reporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72627,6 +74088,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube-reporting_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube-reporting"; + version = "0.1.1"; + sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Reporting SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -72764,6 +74238,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-oauth2-jwt_0_1_2_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.1.2.1"; + sha256 = "1a727b31280b53cb9db6531b8580dba8843a4beba0e866f34ff0231e7590b72b"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -74439,8 +75930,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.5"; - sha256 = "ffdfb54247dfbdf3b9936504802e3e0d2238cf5a0c145e745899d2c17f7c7001"; + version = "0.14.6"; + sha256 = "707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -74501,8 +75992,8 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.3.0"; - sha256 = "639a8f6993a902346555f0cef188418fadb8f272f98d5f1f485e4c2b832641c3"; + version = "0.3.3.1"; + sha256 = "af651245db161e1b46f5a54ec04f908c40bbd7dc1f73df7531da8c78d2716b39"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; @@ -74737,8 +76228,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.5"; - sha256 = "be24beff4a7fc08e7cb9b4e8d623f3ae884730c8dc22af12ab65efd362b0bc48"; + version = "0.14.6"; + sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -74755,8 +76246,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.3.0"; - sha256 = "c55a0c38dca1904bef528568d914a76f349ba87279b4a8ed3997bb9ac6b0a2e3"; + version = "0.3.3.1"; + sha256 = "a5ba824ffc75f48c35e779f045cae753a0cdee9f78d69bbd9b9c5260d54ee0fc"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -74767,16 +76258,16 @@ self: { }) {gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext - , pango + ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools + , gtkglext, pango }: mkDerivation { pname = "gtkglext"; - version = "0.12.5.0"; - sha256 = "13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6"; + version = "0.13.1.1"; + sha256 = "70f0b6e42dd8635d5c4d852e497b0bd34683a363e7c016bfc8e5d11e84036497"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; - libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; @@ -74827,8 +76318,8 @@ self: { }: mkDerivation { pname = "gtksourceview2"; - version = "0.13.3.0"; - sha256 = "20747e2bff7b9e49bc4952a4ba706c72c02edafdb7eb86e00038dd438b5937cc"; + version = "0.13.3.1"; + sha256 = "a1c5ebc07faa5b2809d424b3ded5e9cfa0a5338b51c7989e2a0271d016c5fe53"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl text @@ -74845,8 +76336,8 @@ self: { }: mkDerivation { pname = "gtksourceview3"; - version = "0.13.3.0"; - sha256 = "c260f3d49e3ee2e3da2e9884f948e904b7e376bb885d0ce7da346bcab58042f2"; + version = "0.13.3.1"; + sha256 = "9a7e12fda53d532668ee7f830c0aacf43c8a0c9a65f571fa81088a7372383b7b"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl text @@ -75205,6 +76696,7 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -75367,8 +76859,8 @@ self: { ({ mkDerivation, base, containers, hmatrix, random }: mkDerivation { pname = "hTensor"; - version = "0.9.0"; - sha256 = "0abf643e33f0cc10c652d871390e8c5b07f6e549dd0f1bb44f159d61596c0c6a"; + version = "0.9.1"; + sha256 = "b342d7c115af9b33a18b22b439ffc86d9141027a5ce657f6f95ee3bdf8fff523"; libraryHaskellDepends = [ base containers hmatrix random ]; homepage = "http://perception.inf.um.es/tensor"; description = "Multidimensional arrays and simple tensor computations"; @@ -76881,8 +78373,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.0.0"; - sha256 = "6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e"; + version = "4.9.1.0"; + sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77128,6 +78620,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-series" = callPackage + ({ mkDerivation, base, containers, hakyll }: + mkDerivation { + pname = "hakyll-series"; + version = "0.1.0.1"; + sha256 = "5dc50cd068aa082a2b5bf7d0beb6114ff1b0d7cd817b5ce0ef439798dda706b1"; + libraryHaskellDepends = [ base containers hakyll ]; + homepage = "https://github.com/oisdk/hakyll-series"; + description = "Adds series functionality to hakyll"; + license = stdenv.lib.licenses.mit; + }) {}; + "hakyll-shakespeare" = callPackage ({ mkDerivation, base, blaze-html, containers, hakyll, shakespeare , text @@ -79208,8 +80712,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.4.4"; - sha256 = "7bd450caafb4220aa6e0e86bd4a03815d8a903204f2bb79fb89a60e3a6902d5c"; + version = "0.4.5"; + sha256 = "910043c589d093935d99d060f110482b13c76496d215de4d49a276237d8331cc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79631,8 +81135,8 @@ self: { }: mkDerivation { pname = "haskell-igraph"; - version = "0.1.0"; - sha256 = "fc335506a48d1479ed59eeaf5c073e682c380c61360293188d84d5c0a232e21f"; + version = "0.2.2"; + sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing colour data-default-class hashable hxt primitive split unordered-containers @@ -80120,15 +81624,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_18_2" = callPackage + "haskell-src-exts_1_19_0" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.18.2"; - sha256 = "31583804dcec5c200bcf184db8a2eb33fdcc3354b011c6485370be63b2710943"; + version = "1.19.0"; + sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -80349,6 +81853,7 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-demo" = callPackage @@ -80374,6 +81879,7 @@ self: { homepage = "https://github.com/haskell-tools/haskell-tools"; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage @@ -82004,8 +83510,8 @@ self: { }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.1.3"; - sha256 = "15fe3075dc4cf9a5ea9875cb15da469ee414223696c0e9eb3163a44d23c38463"; + version = "1.1.4"; + sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -84329,6 +85835,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "XML parser/formatter based on expat"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-iteratee" = callPackage @@ -84382,6 +85889,7 @@ self: { homepage = "http://code.haskell.org/hexpat-pickle/"; description = "XML picklers based on hexpat, source-code-similar to those of the HXT package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle-generic" = callPackage @@ -84411,6 +85919,7 @@ self: { libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpr" = callPackage @@ -86355,44 +87864,6 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, base-compat, cmdargs, containers, csv - , directory, filepath, haskeline, hledger-lib, HUnit, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, terminfo, test-framework - , test-framework-hunit, text, time, unordered-containers - , utf8-string, wizards - }: - mkDerivation { - pname = "hledger"; - version = "0.27.1"; - sha256 = "f85b8d7ea7a2c7ef1ba1fa4645df951a7bf2f83e4117fdc34d9dacfa7d17376e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards - ]; - homepage = "http://hledger.org"; - description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; - }) {}; - - "hledger_1_0_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers , csv, data-default, directory, file-embed, filepath, hashable , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat @@ -86432,7 +87903,6 @@ self: { homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-api" = callPackage @@ -86474,7 +87944,6 @@ self: { homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-diff" = callPackage @@ -86493,23 +87962,6 @@ self: { }) {}; "hledger-interest" = callPackage - ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, time }: - mkDerivation { - pname = "hledger-interest"; - version = "1.4.4"; - sha256 = "d6ad4a75d810d64c9f70a19ff2b51fe37d79313c4bb1b78d95e5ddcc5998769a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal Decimal hledger-lib mtl time - ]; - homepage = "http://github.com/peti/hledger-interest"; - description = "computes interest for a given account"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hledger-interest_1_5" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: mkDerivation { @@ -86524,7 +87976,6 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -86546,34 +87997,6 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, Decimal, deepseq, directory, filepath - , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , safe, split, test-framework, test-framework-hunit, time - , transformers, uglymemo, utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "0.27.1"; - sha256 = "de9780b2d5a88d1f9518bb02bfda27cc55352f5f0b7f43770906a43e0601465f"; - libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split time transformers - uglymemo utf8-string - ]; - testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit time transformers uglymemo utf8-string - ]; - homepage = "http://hledger.org"; - description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; - }) {}; - - "hledger-lib_1_0_1" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, data-default, Decimal, deepseq , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl @@ -86601,7 +88024,6 @@ self: { homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-ui" = callPackage @@ -86612,8 +88034,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.0.2"; - sha256 = "0a1ec9ecb14bfe6726cc7d27a8adf1f4ea198362423a024402975f79f30e2b2c"; + version = "1.0.4"; + sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86625,7 +88047,6 @@ self: { homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-vty" = callPackage @@ -86644,7 +88065,6 @@ self: { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-web" = callPackage @@ -86689,7 +88109,6 @@ self: { homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlibBladeRF" = callPackage @@ -86933,6 +88352,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix_0_18_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , openblasCompat, random, split, storable-complex, vector + }: + mkDerivation { + pname = "hmatrix"; + version = "0.18.0.0"; + sha256 = "35766dfb4af7227a881ef1c8b740a9b5c09253f21e23ae295a5341511a913cfe"; + configureFlags = [ "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random split storable-complex + vector + ]; + librarySystemDepends = [ openblasCompat ]; + preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'"; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numeric Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openblasCompat;}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -86963,8 +88403,8 @@ self: { ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.5.0.0"; - sha256 = "ca90e4f1b8e95547ad70bf16c4334504ec2d5d446dad8b0fd0d4929e4ccbc551"; + version = "0.6.0.0"; + sha256 = "c1ca26cf362f5255dc9d399615c683f1fd7de9154f3202468edf6c9c4184af74"; libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; @@ -86988,6 +88428,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_18_0_1" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.18.0.1"; + sha256 = "fda5c3b067bb2e47fac80995c0722bdbdf9f9320ea8a04fc2eca30f3fea9d455"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -87070,6 +88527,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-special_0_4_0_1" = callPackage + ({ mkDerivation, base, hmatrix, hmatrix-gsl }: + mkDerivation { + pname = "hmatrix-special"; + version = "0.4.0.1"; + sha256 = "72a9c9c559da6b6314e6042ddfd53d638fdf1b819978a630fc339e0859c3ec4e"; + libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Interface to GSL special functions"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-static" = callPackage ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec , template-haskell, tfp @@ -87118,15 +88588,15 @@ self: { }) {}; "hmatrix-tests" = callPackage - ({ mkDerivation, base, deepseq, hmatrix, hmatrix-gsl, HUnit + ({ mkDerivation, base, binary, deepseq, hmatrix, hmatrix-gsl, HUnit , QuickCheck, random }: mkDerivation { pname = "hmatrix-tests"; - version = "0.5.0.0"; - sha256 = "a47819899e6eb7844ad6b863dece79d347cf897cb313f59ee62bbeb608661634"; + version = "0.6.0.0"; + sha256 = "30a61b749705b0291ffe03514545ecf24989554f6a4632b5a73f72daade1c4d7"; libraryHaskellDepends = [ - base deepseq hmatrix hmatrix-gsl HUnit QuickCheck random + base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; testHaskellDepends = [ base HUnit QuickCheck random ]; homepage = "https://github.com/albertoruiz/hmatrix"; @@ -88244,38 +89714,6 @@ self: { }) {}; "hoogle" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit - , conduit-extra, connection, containers, deepseq, directory, extra - , filepath, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network, network-uri, network-uri-flag - , old-locale, process, QuickCheck, resourcet, tar, template-haskell - , text, time, transformers, uniplate, utf8-string, vector, wai - , wai-logger, warp, warp-tls, zlib - }: - mkDerivation { - pname = "hoogle"; - version = "5.0.1"; - sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e"; - revision = "1"; - editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring cmdargs conduit conduit-extra - connection containers deepseq directory extra filepath - haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri network-uri-flag old-locale process QuickCheck - resourcet tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib - ]; - executableHaskellDepends = [ base ]; - testTarget = "--test-option=--no-net"; - homepage = "http://hoogle.haskell.org/"; - description = "Haskell API Search"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoogle_5_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -88303,7 +89741,6 @@ self: { homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoogle-index" = callPackage @@ -88470,6 +89907,7 @@ self: { homepage = "http://floss.scru.org/hopenpgp-tools"; description = "hOpenPGP-based command-line tools"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hopenssl" = callPackage @@ -89293,37 +90731,6 @@ self: { }) {}; "hpio" = callPackage - ({ mkDerivation, async, base, base-compat, bytestring, containers - , directory, doctest, exceptions, filepath, hlint, hspec, mtl - , mtl-compat, optparse-applicative, QuickCheck, text, transformers - , transformers-compat, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.8.0.3"; - sha256 = "699fc04179a479e2b1560122166c6687cd7214d2fa7376c14210465625657974"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring containers directory exceptions - filepath mtl mtl-compat QuickCheck text transformers - transformers-compat unix unix-bytestring - ]; - executableHaskellDepends = [ - async base base-compat exceptions mtl mtl-compat - optparse-applicative transformers transformers-compat - ]; - testHaskellDepends = [ - async base base-compat bytestring containers directory doctest - exceptions filepath hlint hspec mtl mtl-compat QuickCheck text - transformers transformers-compat unix unix-bytestring - ]; - homepage = "https://github.com/dhess/hpio"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_8_0_4" = callPackage ({ mkDerivation, async, base, base-compat, bytestring, containers , directory, doctest, exceptions, filepath, hlint, hspec, mtl , mtl-compat, optparse-applicative, QuickCheck, text, transformers @@ -89352,7 +90759,6 @@ self: { homepage = "https://github.com/dhess/hpio"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -92002,16 +93408,17 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.2.3"; - sha256 = "511e994ee86d85c610bf20a3eb8309e79816e984dc46f4d0f95bd7dc676f6210"; + version = "2.2.4"; + sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1"; revision = "1"; - editedCabalFile = "8e446bc3a3332ce9d5dc255a32682b735c8352b187e71f228f529e2fa79e6473"; + editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers ]; testHaskellDepends = [ - base directory hspec-core hspec-meta stringbuilder + base directory hspec-core hspec-discover hspec-expectations + hspec-meta HUnit QuickCheck stringbuilder transformers ]; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; @@ -92094,10 +93501,10 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.2.3"; - sha256 = "01fa6959921ae0ed3de5e3f612451fe788800f9670c7f425a241f5f0dec99652"; + version = "2.2.4"; + sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475"; revision = "1"; - editedCabalFile = "9ff10012fa0457540d12846b875dd747a73a65aa8ba08876c473f42b7ac27c07"; + editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3"; libraryHaskellDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -92142,8 +93549,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.2.3"; - sha256 = "dc6053d7ad628a133fab01f11ad6d7dfecd23873e2bbe9419d30ee0318b5a92f"; + version = "2.2.4"; + sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -92215,15 +93622,12 @@ self: { }) {}; "hspec-expectations-lifted" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, transformers }: + ({ mkDerivation, base, hspec-expectations, transformers }: mkDerivation { pname = "hspec-expectations-lifted"; - version = "0.5.0"; - sha256 = "0b5511f1e4728f3b7b0eba53812319959009ab1277d14eede50f73d9f9eb6e30"; - revision = "1"; - editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208"; + version = "0.8.2"; + sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef"; libraryHaskellDepends = [ base hspec-expectations transformers ]; - testHaskellDepends = [ base hspec ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; }) {}; @@ -93291,6 +94695,7 @@ self: { homepage = "http://hstox.github.io"; description = "A Tox protocol implementation in Haskell"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstradeking" = callPackage @@ -94742,33 +96147,6 @@ self: { }) {}; "http-reverse-proxy" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, containers - , data-default-class, hspec, http-client, http-conduit, http-types - , lifted-base, monad-control, network, resourcet, streaming-commons - , text, transformers, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.4.3.1"; - sha256 = "579285aa58836631f8393f733b524a8c74591ed0318632bed97d4eaa090783eb"; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra containers data-default-class http-client http-types - lifted-base monad-control network resourcet streaming-commons text - transformers wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types lifted-base network resourcet - streaming-commons transformers wai warp - ]; - homepage = "https://github.com/fpco/http-reverse-proxy"; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-reverse-proxy_0_4_3_2" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers , data-default-class, hspec, http-client, http-conduit, http-types @@ -94793,7 +96171,6 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-server" = callPackage @@ -95069,6 +96446,7 @@ self: { homepage = "http://justhub.org"; description = "For multiplexing GHC installations and providing development sandboxes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubigraph" = callPackage @@ -95567,6 +96945,7 @@ self: { homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage @@ -95657,22 +97036,6 @@ self: { }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.4"; - sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hw-diagnostics_0_0_0_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; @@ -95682,7 +97045,6 @@ self: { homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-eliasfano" = callPackage @@ -95702,6 +97064,7 @@ self: { homepage = "http://github.com/haskell-works/hw-eliasfano#readme"; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage @@ -95721,6 +97084,7 @@ self: { homepage = "http://github.com/haskell-works/hw-excess#readme"; description = "Excess"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -95800,6 +97164,7 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -95835,6 +97200,7 @@ self: { homepage = "http://github.com/haskell-works/hw-packed-vector#readme"; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage @@ -95944,6 +97310,7 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-string-parse" = callPackage @@ -96047,6 +97414,7 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -96347,6 +97715,7 @@ self: { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Expat parser for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -96842,8 +98211,8 @@ self: { }: mkDerivation { pname = "hylide"; - version = "0.1.4.1"; - sha256 = "e0c98883073da1513757698c2c70cee419db20e351127e83c31e01239c66a94e"; + version = "0.1.5.1"; + sha256 = "160e2d915caa220b410f5e1ccbbaaa215c6cf1390a51ff2b1d27bccceb82df67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hylogen vector-space ]; @@ -96851,8 +98220,8 @@ self: { aeson base bytestring filepath fsnotify hint http-types hylogen process text wai warp websockets ]; - homepage = "https://github.com/sleexyz/hylide"; - description = "WebGL renderer for livecoding shaders with Hylogen"; + homepage = "https://github.com/sleexyz/hylogen"; + description = "WebGL live-coding environment for writing shaders with Hylogen"; license = stdenv.lib.licenses.mit; }) {}; @@ -96860,11 +98229,11 @@ self: { ({ mkDerivation, base, data-reify, vector-space }: mkDerivation { pname = "hylogen"; - version = "0.1.4.1"; - sha256 = "dc78062033fd5f6c4c4f1faed5229fe79a249f063c50d826dbd3b5af5ebfc4d3"; + version = "0.1.5.1"; + sha256 = "3d07172627f22cfba684d15fcbf27079b5542a049734f67fbf1c7b5c8f5d4941"; libraryHaskellDepends = [ base data-reify vector-space ]; homepage = "https://github.com/sleexyz/hylogen"; - description = "Purely functional GLSL embedded in Haskell"; + description = "GLSL embedded in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -96881,6 +98250,7 @@ self: { ]; description = "Tools for hybrid logics related programs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hylotab" = callPackage @@ -99786,29 +101156,6 @@ self: { }) {}; "intero" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec - , process, regex-compat, syb, temporary, time, transformers, unix - }: - mkDerivation { - pname = "intero"; - version = "0.1.18"; - sha256 = "7e546a35df019149e38bf2a33cd977c2143e650b45a3c7835a42fd1c7099c570"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring containers directory filepath ghc ghc-boot-th - ghc-paths ghci haskeline process syb time transformers unix - ]; - testHaskellDepends = [ - base directory hspec process regex-compat temporary transformers - ]; - homepage = "https://github.com/commercialhaskell/intero"; - description = "Complete interactive development program for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "intero_0_1_19" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec , process, regex-compat, syb, temporary, time, transformers, unix @@ -99829,7 +101176,6 @@ self: { homepage = "https://github.com/commercialhaskell/intero"; description = "Complete interactive development program for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpol" = callPackage @@ -100394,13 +101740,13 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.8.6"; - sha256 = "e8e53531f7165234845a58f2a6b893dbf0bbb75ac3f08870005f9c3fd67c4d6b"; + version = "0.8.7"; + sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; testHaskellDepends = [ - base bytestring doctest HUnit QuickCheck test-framework + attoparsec base bytestring doctest HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/haskell-ip#readme"; @@ -100434,6 +101780,7 @@ self: { homepage = "http://www.ip2location.com"; description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ip6addr" = callPackage @@ -100645,25 +101992,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit - , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text - , time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "0.4.4.0"; - sha256 = "b5299e0b5d47f32828b5bb0a23a872105f6c778b8a6c15cf4ce8a7691c69ab3a"; - libraryHaskellDepends = [ - base bytestring conduit connection irc-conduit irc-ctcp - network-conduit-tls old-locale stm stm-conduit text time tls - transformers x509 x509-store x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_0_4_4_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text , time, tls, transformers, x509, x509-store, x509-validation @@ -100680,7 +102008,6 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -100695,24 +102022,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.1.0"; - sha256 = "c363a8096e15459c379cfb73e025c1102b4c6e367716c1408216977401b6445c"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_1_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls , transformers, x509-validation @@ -100728,7 +102037,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -101397,16 +102705,14 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.3"; - sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6"; - revision = "1"; - editedCabalFile = "2149b10ef5f9149f362f51960ddd252205c4ee348869741e70d3a33892fe66be"; + version = "0.1.0.4"; + sha256 = "96a056e1f3d766223d93dcd3aaedd6619aa1806f31903c3f46e30a058705583f"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift ]; libraryToolDepends = [ alex happy ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101418,8 +102724,8 @@ self: { }: mkDerivation { pname = "ivory-artifact"; - version = "0.1.0.3"; - sha256 = "375a287288e9886bc9055c128e0d2d4cddab985baf8e52a82176c323b98f401e"; + version = "0.1.0.4"; + sha256 = "a2aa0b21fa58c5f87d5001f74fcbfda439a6dbfb56577214447c75f3b204ce8c"; libraryHaskellDepends = [ base directory filepath HStringTemplate text utf8-string ]; @@ -101436,14 +102742,14 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.3"; - sha256 = "44e43e14e1951c4703c99bf116d6951eff575124d92f58dd7450f19ec14aa33e"; + version = "0.1.0.4"; + sha256 = "1515d217549af8189b83a5963ddfd6d202b58cdb9f98644a41988e7b67884caf"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib process srcloc template-haskell ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101475,15 +102781,15 @@ self: { }: mkDerivation { pname = "ivory-eval"; - version = "0.1.0.3"; - sha256 = "94acbed559f5567d291f95fb3ce70e9487cbf31bfc4721030017bbc5f078b958"; + version = "0.1.0.4"; + sha256 = "dd4f92558eea73265d680963bfad48112c782ed144726ee001f547216368e020"; libraryHaskellDepends = [ base base-compat containers ivory monadLib ]; testHaskellDepends = [ base base-compat containers ivory monadLib tasty tasty-hunit ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101496,31 +102802,29 @@ self: { }: mkDerivation { pname = "ivory-examples"; - version = "0.1.0.3.1"; - sha256 = "f73720e850410a0d3ab4acfc6fe478c2d475f9e2e12c6782ec9f8a1236690f82"; + version = "0.1.0.4"; + sha256 = "d61091b079166b06537feb0a719d7e4e09718732df3f1f264167af800f72900a"; + revision = "2"; + editedCabalFile = "7b0f9b186a1356c9210ecfe4ae198b1fa3056f1c78188126b83fbd39c09e253f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib monadLib pretty QuickCheck template-haskell ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org/"; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-hw" = callPackage - ({ mkDerivation, base, filepath, ivory, ivory-artifact - , ivory-backend-c - }: + ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-hw"; - version = "0.1.0.3"; - sha256 = "0dec96122661a8f281daf7e52f8e7dcc80481090518115a8c6e0859d919f64b2"; - libraryHaskellDepends = [ - base filepath ivory ivory-artifact ivory-backend-c - ]; + version = "0.1.0.4"; + sha256 = "d441e06d61ffaada4719d6b274d090308accba9e71f49bd3d31be608f26193dc"; + libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; @@ -101533,8 +102837,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.3"; - sha256 = "caaf34f5b38ec88fe422cc367f28ab8b98b1a3b131dadaffcd8000b438562eb3"; + version = "0.1.0.4"; + sha256 = "14c1337cdd8f4a06ff6e99e050fb5d9bd98ec221c77de510368cb8aa4f7b7019"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -101552,8 +102856,8 @@ self: { }: mkDerivation { pname = "ivory-quickcheck"; - version = "0.2.0.3"; - sha256 = "ca005a77265d6140cabe7796062d145ae8be185123db1095c957aee76aec56f4"; + version = "0.2.0.4"; + sha256 = "c7c3e1dcf2c3bbf21612445155f1e869576e5dcd9099b7d4eea0694b327d63a5"; libraryHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-eval monadLib QuickCheck random @@ -101574,8 +102878,8 @@ self: { }: mkDerivation { pname = "ivory-serialize"; - version = "0.1.0.3"; - sha256 = "bb07a4218c8e6d314ee5aa0bdf75891a9f9b7a106020f4bb439bfe26053610eb"; + version = "0.1.0.4"; + sha256 = "bf73dccdcac406b7adc8981e01d9b363df6411ce7e7bb70daf2f6065f17abc12"; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib ]; @@ -101588,10 +102892,10 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-stdlib"; - version = "0.1.0.3"; - sha256 = "0ff865b14e046a9caffd1ac79e256568bd3bf60aa648e673582d7009bdcc635c"; + version = "0.1.0.4"; + sha256 = "912b78ed7b5143ff54517f3c483dd73dab9401cfce2c0a4f43fcdc9ca7413c5b"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101874,8 +103178,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.1"; - sha256 = "b3a5069b8725f7ace65f2e921d0451f42996bd6e198d38e32ef948b44ec90349"; + version = "0.5.2"; + sha256 = "cf7b09b08144d7cdc35111a07a1374b08b099a4d639da12bcad9502a830bcebc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102208,6 +103512,7 @@ self: { homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {jvm = null;}; "jobqueue" = callPackage @@ -103346,6 +104651,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {Judy = null;}; + "juicy-gcode" = callPackage + ({ mkDerivation, base, configurator, lens, linear, matrix + , optparse-applicative, svg-tree, text + }: + mkDerivation { + pname = "juicy-gcode"; + version = "0.1.0.1"; + sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base configurator lens linear matrix optparse-applicative svg-tree + text + ]; + homepage = "https://github.com/domoszlai/juicy-gcode"; + description = "SVG to G-Code converter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jukebox" = callPackage ({ mkDerivation, alex, array, base, containers, directory, dlist , filepath, minisat, pretty, process, symbol, transformers @@ -103438,6 +104763,7 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -103724,25 +105050,26 @@ self: { ({ mkDerivation, aeson, auto-update, base, bytestring, containers , directory, either, exceptions, hostname, microlens, microlens-th , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa - , resourcet, semigroups, string-conv, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, time - , time-locale-compat, transformers, transformers-base + , resourcet, semigroups, string-conv, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , time, time-locale-compat, transformers, transformers-base , transformers-compat, unix, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.3.0.0"; - sha256 = "6e828cdeaff7e569f19b5b40c8409cf549d53556341e7064272ee1a7a3ab907e"; + version = "0.3.1.0"; + sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale resourcet semigroups string-conv template-haskell text time - time-locale-compat transformers transformers-base - transformers-compat unix unordered-containers + transformers transformers-base transformers-compat unix + unordered-containers ]; testHaskellDepends = [ - aeson base directory quickcheck-instances regex-tdfa tasty - tasty-hunit tasty-quickcheck template-haskell temporary text time + aeson base bytestring directory microlens quickcheck-instances + regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck + template-haskell temporary text time time-locale-compat unordered-containers ]; homepage = "https://github.com/Soostone/katip"; @@ -106029,8 +107356,8 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.9.2"; - sha256 = "da975b3d40de997e4f21a47867894aa0208e8581015bed70b903fe199eb1f62d"; + version = "0.7.10.0"; + sha256 = "d1d882c8312bcbc37869b96a5c5a16733db9c917566f11a18a4799fcc6814b94"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell @@ -106126,31 +107453,6 @@ self: { }) {}; "language-dockerfile" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, free, Glob - , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck - , ShellCheck, split, template-haskell, test-framework - , test-framework-hunit, th-lift, th-lift-instances, transformers - }: - mkDerivation { - pname = "language-dockerfile"; - version = "0.3.4.0"; - sha256 = "94e6996d5e56b6fb73f967e09d47d1aa2dc5a8e31ce991f27b49f28a3d8953d0"; - libraryHaskellDepends = [ - base bytestring free mtl parsec pretty ShellCheck split - template-haskell th-lift th-lift-instances transformers - ]; - testHaskellDepends = [ - base bytestring directory filepath free Glob hspec HUnit mtl parsec - pretty process QuickCheck ShellCheck split template-haskell - test-framework test-framework-hunit th-lift th-lift-instances - transformers - ]; - homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; - description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "language-dockerfile_0_3_5_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, free, Glob , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck , ShellCheck, split, template-haskell, test-framework @@ -106173,7 +107475,6 @@ self: { homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dot" = callPackage @@ -107555,8 +108856,8 @@ self: { }: mkDerivation { pname = "legion"; - version = "0.6.0.0"; - sha256 = "dab609f13594fd58d78ac5775d9e1027247d17ef5a29ca319140afa2f05f49d2"; + version = "0.7.0.0"; + sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27"; libraryHaskellDepends = [ aeson attoparsec base binary binary-conduit bytestring canteven-http canteven-log conduit conduit-extra containers @@ -107594,6 +108895,7 @@ self: { homepage = "https://github.com/owensmurray/legion-discovery#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "legion-discovery-client" = callPackage @@ -107621,8 +108923,8 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.0.4"; - sha256 = "6961f3d40eac0bef0a6aa9301e6057ee79bf92ccec82cd6f60957b759dc1c048"; + version = "0.1.0.5"; + sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6"; libraryHaskellDepends = [ aeson base bytestring canteven-log containers data-default-class legion network safe split yaml @@ -108029,6 +109331,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-xml" = callPackage + ({ mkDerivation, base, lens, xml }: + mkDerivation { + pname = "lens-xml"; + version = "0.1.0.0"; + sha256 = "21ef72a6579a56528fd158aa9594e50257224cf77dcc303a5fd153a2097a1ba8"; + revision = "1"; + editedCabalFile = "5e9b888e270e22fee6210c9a6f329e31e80d4c0a54d064ef29ef969bc443b21d"; + libraryHaskellDepends = [ base lens xml ]; + testHaskellDepends = [ base lens xml ]; + homepage = "https://github.com/nkpart/lens-xml#readme"; + description = "Lenses for the xml package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lenses" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -109198,16 +110515,15 @@ self: { }: mkDerivation { pname = "lightning-haskell"; - version = "0.1.0.2"; - sha256 = "f6616270f8a15bc6a1efb5fe3431f97112c6c2a144c0f90f88e9df6a931b04d7"; + version = "0.1.0.3"; + sha256 = "1930569f4d52ead5c72f3a8beeb9c9ba3cc805cb7d89832ffbcae997ead275c0"; libraryHaskellDepends = [ aeson api-builder base blaze-html bytestring data-default-class free http-client http-client-tls http-types mtl network text transformers ]; testHaskellDepends = [ - aeson api-builder base bytestring hspec http-client http-client-tls - http-types network text transformers + aeson api-builder base bytestring hspec text transformers ]; homepage = "https://github.com/cmoresid/lightning-haskell#readme"; description = "Haskell client for lightning-viz REST API"; @@ -113665,7 +114981,7 @@ self: { version = "0.2.0.1"; sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55"; revision = "1"; - editedCabalFile = "1e17d3b0d97cd033dd95b227ab387d6c3118a9b3191a290a593542f2ef0c4698"; + editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -113990,6 +115306,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "marvin" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, classy-prelude + , configurator, directory, filepath, hslogger, lens, mtl, mustache + , network-uri, optparse-generic, random, template-haskell + , text-format, text-icu, vector, websockets, wreq, wuss + }: + mkDerivation { + pname = "marvin"; + version = "0.0.1"; + sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring classy-prelude configurator hslogger + lens mtl network-uri optparse-generic random template-haskell + text-format text-icu vector websockets wreq wuss + ]; + executableHaskellDepends = [ + base classy-prelude directory filepath mustache optparse-generic + ]; + homepage = "https://github.com/JustusAdam/marvin#readme"; + description = "A modular bot for slack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -114132,6 +115474,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mathexpr" = callPackage + ({ mkDerivation, base, data-default-class }: + mkDerivation { + pname = "mathexpr"; + version = "0.1.0.0"; + sha256 = "f2f20f96c3674e65be8c34d409addca4363d5921391e01ca77c3266261aeb197"; + libraryHaskellDepends = [ base data-default-class ]; + homepage = "https://github.com/mdibaiee/mathexpr"; + description = "Parse and evaluate math expressions with variables and functions"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mathgenealogy" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup @@ -114482,8 +115836,8 @@ self: { ({ mkDerivation, base, containers, mwc-probability, transformers }: mkDerivation { pname = "mcmc-types"; - version = "1.0.1"; - sha256 = "04e11474719161813da8ce505a7052853a26a237d5ddee99ed198a3326b246e0"; + version = "1.0.2"; + sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3"; libraryHaskellDepends = [ base containers mwc-probability transformers ]; @@ -114919,8 +116273,8 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.2.0.0"; - sha256 = "348f9f78616185655b96b281a9436522a711349fc51c093dd6fc6a41bfdde3cf"; + version = "0.2.0.1"; + sha256 = "0f77d99f49158ed2e715d52dc25260fb9fffe094300900cf0234745b02f7d85c"; libraryHaskellDepends = [ base binary blaze-builder bytestring data-default-class hashable network resource-pool time vector @@ -115901,8 +117255,8 @@ self: { }: mkDerivation { pname = "mighty-metropolis"; - version = "1.0.2"; - sha256 = "639c560cdb6d4f1d793cf9baf02dca60ca290a6d1831e463f6c92458bd83c0f2"; + version = "1.0.3"; + sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80"; libraryHaskellDepends = [ base mcmc-types mwc-probability pipes primitive transformers ]; @@ -116651,8 +118005,8 @@ self: { }: mkDerivation { pname = "mockery"; - version = "0.3.3"; - sha256 = "61157a39a3123001e0b8c7714e171980e879d01bf43f7b171e393ecab6c0fad4"; + version = "0.3.4"; + sha256 = "30fe35f4f9cfd1b85a4ccc514a25ef066148364886e53538d50e5e760a582938"; libraryHaskellDepends = [ base base-compat bytestring directory filepath logging-facade temporary @@ -116931,8 +118285,8 @@ self: { }: mkDerivation { pname = "mole"; - version = "0.0.3"; - sha256 = "dd9dd149f4c5ce0e9e9bec0c75277b9a4fad51ff6a1545f0231ba94e0b51469e"; + version = "0.0.5"; + sha256 = "0b0735bcd5afc88f192457a6b7dd3266d3341ec911d31a2fcd67acaf2b517893"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119499,21 +120853,20 @@ self: { }) {}; "multifile" = callPackage - ({ mkDerivation, base, directory, HaXml, optparse-applicative - , pretty - }: + ({ mkDerivation, base, directory, HaXml, pretty, transformers }: mkDerivation { pname = "multifile"; - version = "0.1.0.2"; - sha256 = "acfcdc40b0ec9a11cd0de2efaa6fb1b4164907b24d3326ea78b5576ee51ac784"; + version = "0.1.0.3"; + sha256 = "f02f1c4fda7708c064735f7b5c5b8fec59c27522c0fce1c057c3705d9e70a322"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory HaXml optparse-applicative pretty + base directory HaXml pretty transformers ]; homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -120344,18 +121697,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; - version = "1.2.1"; - sha256 = "c06d839399b1bd64db11288f017badb13bea2e87afb22bd3ff1888a6171574fd"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - homepage = "http://github.com/jtobin/mwc-probability"; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_1_2_2" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -120365,7 +121706,6 @@ self: { homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random" = callPackage @@ -120501,8 +121841,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.3"; - sha256 = "282e9dc78d9b0f8f4e99ef7d1cd257a3a41a66a4e890bc6823dade4af6317a0d"; + version = "0.1.4"; + sha256 = "9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -121793,6 +123133,7 @@ self: { homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; "nettle-frp" = callPackage @@ -121928,6 +123269,7 @@ self: { ]; description = "Netwire/GLFW/VinylGL input handling demo"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network" = callPackage @@ -122404,8 +123746,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-multicast"; - version = "0.1.2"; - sha256 = "82dcd07dd7f62d0ba23f4b37469768f07bcf6bd888dd54ebe61603f6fd2ccefb"; + version = "0.2.0"; + sha256 = "0f3b50abc3a401c20cc6a0ec51a49d2a48e5b467d9fbd63b7cf803165fe975f2"; libraryHaskellDepends = [ base network ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; @@ -123055,8 +124397,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.2.0"; - sha256 = "d9d97e8b1f7ce0dd3c183dabe9b1856e4c0594617a1da5a22e34782648deadef"; + version = "0.2.3.0"; + sha256 = "c6b7d05e5546ad7b18ab642e183fc4f7841d17cd501205606e423fa3ec908afe"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -123892,6 +125234,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ntrip-client" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, basic-prelude + , bytestring, case-insensitive, conduit, conduit-extra, exceptions + , http-types, lens, lifted-async, monad-control, optparse-generic + , uri-bytestring + }: + mkDerivation { + pname = "ntrip-client"; + version = "0.1.3"; + sha256 = "a3884c256f886658069d7d39fe5eef3c22078b10bb104913796b2a10ea6cbeb1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring basic-prelude bytestring + case-insensitive conduit conduit-extra exceptions http-types lens + lifted-async monad-control uri-bytestring + ]; + executableHaskellDepends = [ + base basic-prelude bytestring conduit optparse-generic + ]; + description = "NTRIP client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "null-canvas" = callPackage ({ mkDerivation, aeson, base, containers, filepath, scotty, split , stm, text, transformers, wai-extra, warp @@ -124427,6 +125794,7 @@ self: { homepage = "https://github.com/hverr/haskell-obd#readme"; description = "Communicate to OBD interfaces over ELM327"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "obdd" = callPackage @@ -124765,8 +126133,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.2.0.0"; - sha256 = "b2d7daa84844d0cc1057bbaffc836bb52ff2992b98a17b4b285778bacdefc03c"; + version = "0.3.0.0"; + sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c"; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-client-tls jose-jwt network network-uri text time tls @@ -126454,6 +127822,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "org2anki" = callPackage + ({ mkDerivation, base, parsec, regex-compat }: + mkDerivation { + pname = "org2anki"; + version = "0.1.0"; + sha256 = "389acfbf0d308073dced89c63be5b8ae21d6343970b4700abb31fa6cb6f4053b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base parsec regex-compat ]; + homepage = "https://github.com/M42/org2anki"; + description = "Basic org to anki exporter"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "organize-imports" = callPackage ({ mkDerivation, attoparsec, base, text }: mkDerivation { @@ -127232,39 +128614,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.10.1.2"; - sha256 = "be7b3776a338c4fc46565978bc8c89783e90c3853fe5bc447ddc9bf053bf5f39"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_10_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -127295,7 +128644,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -127535,8 +128883,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.3.0"; - sha256 = "a2c44f889674add7c65326144420d68d47dcdcd511d5c251022fa7a97a60755c"; + version = "0.13.3.1"; + sha256 = "306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb"; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ array base cairo containers directory glib mtl pretty process text @@ -128437,18 +129785,6 @@ self: { }) {}; "partial-handler" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "partial-handler"; - version = "1.0.1"; - sha256 = "e54eb9814d52e384dac62b8e365fafe9fb7319b5d4325d4bd76e4c17662b26f7"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/partial-handler"; - description = "A composable exception handler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "partial-handler_1_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; @@ -128458,7 +129794,6 @@ self: { homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-isomorphisms" = callPackage @@ -128626,8 +129961,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.3.2.0"; - sha256 = "be251bdd996fe8bc89dfe95fb86d9abeda2cd6b6b6044a7ab79900f6c8d27e0b"; + version = "0.3.3.0"; + sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129591,8 +130926,8 @@ self: { }: mkDerivation { pname = "period"; - version = "0.1.0.4"; - sha256 = "f1f0d37ee4e6e31fc448e6f552105d20c3a9359f8af8780d52eeb980d313715c"; + version = "0.1.0.5"; + sha256 = "b66ede8f1609d026cf43b7083fe0f824cb45bea53712632958161884a68cd5f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129687,8 +131022,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.4.0.3"; - sha256 = "0a25f3cfec301e9124293e8f38ad55fba5d18d3d7a9371a971ee17b6152ad360"; + version = "0.4.1.0"; + sha256 = "5bf42a49a7efa127b5f5308ed812c367d3fe1afe499f32e24d0ac0f846df7619"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -129895,8 +131230,8 @@ self: { }: mkDerivation { pname = "persistent-iproute"; - version = "0.2.2"; - sha256 = "b3f9e7dd28e263230b8b5230ad450178202f544ebd01517ff21940a331e36eb1"; + version = "0.2.3"; + sha256 = "f595a11ceaa1c19e11d6f4fc58ec2834eb100791ae82626912115f1d79edbfaa"; libraryHaskellDepends = [ aeson aeson-iproute base bytestring http-api-data iproute path-pieces persistent text @@ -130091,6 +131426,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-relational-record" = callPackage + ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl + , persistable-record, persistent, persistent-template + , relational-query, resourcet, template-haskell, test-framework + , test-framework-hunit, test-framework-th, text, time + }: + mkDerivation { + pname = "persistent-relational-record"; + version = "0.1.0.0"; + sha256 = "b2b5858bcabf3c889e9c30dbb5d12dd45f48683036e565ceebfc245e2c5a8870"; + libraryHaskellDepends = [ + base conduit containers mtl persistable-record persistent + relational-query resourcet template-haskell text + ]; + testHaskellDepends = [ + base hlint HUnit persistent-template relational-query + test-framework test-framework-hunit test-framework-th text time + ]; + homepage = "http://github.com/himura/persistent-relational-record"; + description = "relational-record on persisten backends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-sqlite_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent @@ -131630,6 +132988,7 @@ self: { homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-io" = callPackage @@ -132200,6 +133559,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pkcs10_0_2_0_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers, x509 + }: + mkDerivation { + pname = "pkcs10"; + version = "0.2.0.0"; + sha256 = "896e923f67bac4c7f0e48c9afca60f9ef5178e00fca9f179e8fdae3c12476294"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + x509 + ]; + testHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509 + ]; + homepage = "https://github.com/fcomb/pkcs10-hs#readme"; + description = "PKCS#10 library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pkcs7" = callPackage ({ mkDerivation, base, bytestring, Cabal, HUnit, QuickCheck }: mkDerivation { @@ -133922,8 +135304,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-bind"; - version = "0.2.0.0"; - sha256 = "9e9f91c1b8b41ad19ebd01416435007e847560e840f62e4d5187185d051936fb"; + version = "0.3.0.0"; + sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a"; libraryHaskellDepends = [ attoparsec base bytestring data-default exceptions heredoc postgresql-simple template-haskell text time @@ -133932,7 +135314,7 @@ self: { attoparsec base bytestring case-conversion data-default hspec postgresql-simple text ]; - description = "A FFI-like bindings for PostgreSQL stored functions"; + description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -135090,8 +136472,8 @@ self: { }: mkDerivation { pname = "pringletons"; - version = "0.3"; - sha256 = "2d9587e66b232f66ec7821df4c5999d48883a7f06daf4a39ad1f770b92baecd7"; + version = "0.4"; + sha256 = "1f64cc8a021bcd9f535928e1ed2907df1f556359c28c1a3f4d61f3e1eb0e66fb"; libraryHaskellDepends = [ aeson base hashable singletons template-haskell text unordered-containers vector vinyl @@ -135606,25 +136988,6 @@ self: { }) {}; "profiteur" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , text, unordered-containers, vector - }: - mkDerivation { - pname = "profiteur"; - version = "0.3.0.2"; - sha256 = "43df79a7d3b0a9562658367a46016c361522ea07ac67fb5ad65d891ad77bfbaf"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson attoparsec base bytestring filepath text unordered-containers - vector - ]; - homepage = "http://github.com/jaspervdj/profiteur"; - description = "Treemap visualiser for GHC prof files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profiteur_0_3_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath , text, unordered-containers, vector }: @@ -135641,7 +137004,6 @@ self: { homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -136353,8 +137715,8 @@ self: { }: mkDerivation { pname = "protolude"; - version = "0.1.8"; - sha256 = "014d3a551d4e0929df615ff2df7e0215d67e34af8f03928e98bbaffec98860bc"; + version = "0.1.10"; + sha256 = "163296a518f0d7329dcdf040bf0eddb1fb804eee198405801fab8f192ce1c7a5"; libraryHaskellDepends = [ async base bytestring containers deepseq ghc-prim mtl safe stm text transformers @@ -136613,12 +137975,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161014" = callPackage + "publicsuffix_0_20161031" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161014"; - sha256 = "7fe7abfe8727dc20951c6c7dec35c8ca71ddc34972615f5abe24ae7d3ce99622"; + version = "0.20161031"; + sha256 = "a8e9a7de8e5a0d099520dd5887384d4b87b1659db0e7a4802622112f416601f3"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -137023,6 +138385,7 @@ self: { homepage = "http://github.com/GaloisInc/pure-zlib"; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pureMD5" = callPackage @@ -138257,6 +139620,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-special" = callPackage + ({ mkDerivation, base, bytestring, nats, QuickCheck + , quickcheck-instances, scientific, text + }: + mkDerivation { + pname = "quickcheck-special"; + version = "0.1.0.0"; + sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113"; + libraryHaskellDepends = [ + base bytestring nats QuickCheck quickcheck-instances scientific + text + ]; + homepage = "https://github.com/minad/quickcheck-special#readme"; + description = "Edge cases and special values for QuickCheck Arbitrary instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-text" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: mkDerivation { @@ -139501,8 +140881,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "0.1.0"; - sha256 = "4a2b0ca12153d467d09c623a09a497028346f8838cbb0ce45c333f812539cfe9"; + version = "0.1.4"; + sha256 = "c4db03c11f2ebaacde6d6a0c72da6450556cf703c549620ecaa11fb78eabbe24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139515,8 +140895,10 @@ self: { testHaskellDepends = [ base binary bytestring filepath hlint tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell" = callPackage @@ -140124,6 +141506,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -140142,6 +141525,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -142989,8 +144373,8 @@ self: { }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.2.2"; - sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b"; + version = "0.3.2.3"; + sha256 = "12459698d44496475f48a5f62a8fba5cd746b0aa7552fa577304ee875f85c596"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145034,22 +146418,23 @@ self: { }) {}; "rss2irc" = callPackage - ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs - , containers, deepseq, feed, http-client, http-conduit, http-types - , io-storage, irc, network, old-locale, parsec, regexpr, resourcet - , safe, split, text, time, transformers, utf8-string + ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq + , feed, http-client, http-conduit, http-types, io-storage, irc + , network, network-uri, old-locale, parsec, regexpr, resourcet + , safe, SafeSemaphore, split, stm, text, time, transformers + , utf8-string }: mkDerivation { pname = "rss2irc"; - version = "1.0.6"; - sha256 = "bca14708ca66719261c36d328e6e3801b01b0a62a5525560aad70b7f5276d43d"; + version = "1.1"; + sha256 = "583826c4cb2204034d866f6bab85132b1484e70901b5244e8f76cfe020a60cde"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cabal-file-th cmdargs containers deepseq feed - http-client http-conduit http-types io-storage irc network - old-locale parsec regexpr resourcet safe split text time - transformers utf8-string + base bytestring cmdargs containers deepseq feed http-client + http-conduit http-types io-storage irc network network-uri + old-locale parsec regexpr resourcet safe SafeSemaphore split stm + text time transformers utf8-string ]; homepage = "http://hackage.haskell.org/package/rss2irc"; description = "watches an RSS/Atom feed and writes it to an IRC channel"; @@ -145606,6 +146991,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy_0_9_2" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers, lens + , lens-action, old-time, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, template-haskell, text, time, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.9.2"; + sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3"; + libraryHaskellDepends = [ + array base bytestring cereal containers old-time template-haskell + text time vector + ]; + testHaskellDepends = [ + array base cereal containers lens lens-action QuickCheck + quickcheck-instances tasty tasty-quickcheck template-haskell time + vector + ]; + homepage = "https://github.com/acid-state/safecopy"; + description = "Binary serialization with version control"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safeint" = callPackage ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -146233,8 +147642,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.2.2"; - sha256 = "2629bbcc34c50544b451567c6b314837209e4199133154cab9c0f07803231e16"; + version = "1.2.8"; + sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146304,6 +147713,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sbv_5_13" = callPackage + ({ mkDerivation, array, async, base, base-compat, containers + , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc + , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb + }: + mkDerivation { + pname = "sbv"; + version = "5.13"; + sha256 = "65d1bb21c19ddad03a9dcf19f18d6221c8633428adeda7de11214468c984afbe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base base-compat containers crackNum + data-binary-ieee754 deepseq directory filepath ghc mtl old-time + pretty process QuickCheck random syb + ]; + executableHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit process syb + ]; + testHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit syb + ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -147478,6 +148915,7 @@ self: { executableHaskellDepends = [ base linear sdl2 vector ]; description = "Bindings to SDL2_gfx"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -147959,6 +149397,7 @@ self: { homepage = "https://toktok.github.io/semdoc"; description = "Evaluate code snippets in Literate Haskell"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semi-iso" = callPackage @@ -148081,6 +149520,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semiring-num" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck, random }: + mkDerivation { + pname = "semiring-num"; + version = "0.1.0.6"; + sha256 = "8c14936ff6c32e52af02b0e8a40bb46026db3fb3b096e94268bb93342a9f6608"; + libraryHaskellDepends = [ base containers QuickCheck random ]; + testHaskellDepends = [ base containers doctest QuickCheck ]; + homepage = "https://github.com/oisdk/semiring-num"; + description = "Basic semiring class and instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "semiring-simple" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148524,6 +149976,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serialize-instances" = callPackage + ({ mkDerivation, base, cereal, hashable, semigroups + , unordered-containers + }: + mkDerivation { + pname = "serialize-instances"; + version = "0.1.0.0"; + sha256 = "9c3207fc4cad06fbe76c860820fc48f967494b73ce892efe997723c34b9308d5"; + revision = "2"; + editedCabalFile = "f95554330e4ab10ef1c1a3f291f41ce19bfa4be3c056466a410fbc0f980977c9"; + libraryHaskellDepends = [ + base cereal hashable semigroups unordered-containers + ]; + description = "Instances for Serialize of cereal"; + license = stdenv.lib.licenses.mit; + }) {}; + "serialport" = callPackage ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { @@ -148712,6 +150181,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -148735,6 +150205,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-cookie" = callPackage @@ -148813,6 +150284,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -148887,6 +150359,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -149066,6 +150539,7 @@ self: { ]; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs" = callPackage @@ -149378,8 +150852,8 @@ self: { }: mkDerivation { pname = "servant-matrix-param"; - version = "0.3.1"; - sha256 = "2559133dee1629ddfca41aca6d7ac0f3b0283ae3470228bd5bd71ce4c79f6641"; + version = "0.3.3"; + sha256 = "679e8f5a6e77c1022ae4b23555fbbca2b34d1fd249ab459c670db5c98eb988b3"; libraryHaskellDepends = [ base servant ]; testHaskellDepends = [ aeson base bytestring containers doctest hspec http-client @@ -151442,6 +152916,7 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -152629,6 +154104,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sirkel" = callPackage @@ -155203,19 +156679,19 @@ self: { }) {}; "socket-sctp" = callPackage - ({ mkDerivation, base, bytestring, sctp, socket }: + ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; version = "0.1.0.0"; sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5"; libraryHaskellDepends = [ base bytestring socket ]; - librarySystemDepends = [ sctp ]; + librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; homepage = "https://github.com/lpeterse/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {sctp = null;}; + }) {inherit (pkgs) lksctp-tools;}; "socketio" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base @@ -155782,8 +157258,8 @@ self: { }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.0.9"; - sha256 = "e71d62721edb02d38e578d6c286af76ad7a98638a8b4e398efd3ca7e280371de"; + version = "0.2.1.0"; + sha256 = "83e00cc3e244cea190c407b88660427ffe2019175d1b5aade1dbfb6c0e0ffaa7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156014,8 +157490,8 @@ self: { }: mkDerivation { pname = "speedy-slice"; - version = "0.1.3"; - sha256 = "8be147fe85bf02f1e5bb7cc32e3a61c418354af8875fadb0cd20e4fe804f3992"; + version = "0.1.4"; + sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -156064,23 +157540,6 @@ self: { }) {}; "sphinx" = callPackage - ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 - , network, text, text-icu, xml - }: - mkDerivation { - pname = "sphinx"; - version = "0.6.0.1"; - sha256 = "28496ed2f52d5934de64cbb6b045a37848d2590a65b756000280d132932795dd"; - libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 network text text-icu - xml - ]; - homepage = "https://github.com/gregwebs/haskell-sphinx-client"; - description = "Haskell bindings to the Sphinx full-text searching daemon"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sphinx_0_6_0_2" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , network, text, text-icu, xml }: @@ -156095,7 +157554,6 @@ self: { homepage = "https://github.com/gregwebs/haskell-sphinx-client"; description = "Haskell bindings to the Sphinx full-text searching daemon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphinx-cli" = callPackage @@ -158001,21 +159459,26 @@ self: { }) {}; "staversion" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, optparse-applicative, text, unordered-containers, yaml + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, http-client, http-client-tls, http-types + , optparse-applicative, QuickCheck, text, transformers + , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.1.0.0"; - sha256 = "df252adb8010dbe2553fcd467044a6f99b43ce0ad223762ead0f755484806073"; + version = "0.1.1.0"; + sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring directory filepath optparse-applicative text - unordered-containers yaml + aeson base bytestring containers directory filepath http-client + http-client-tls http-types optparse-applicative text transformers + transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base filepath hspec text ]; + testHaskellDepends = [ + base bytestring filepath hspec QuickCheck text + ]; homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; @@ -158446,8 +159909,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-split"; - version = "0.0.0.1"; - sha256 = "88f3bd9b210377919218a117fd27d1b8350af6aaf65b2f2df2be72e896456314"; + version = "0.0.0.2"; + sha256 = "020786bd45793192010050d18bbb12b30c22cf6b544015c4199dce20def0167e"; libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -160472,8 +161935,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.1.0"; - sha256 = "055adbb80d21091be3703215f1d210f5b40c762adc8450a45a9a39bdc20315a5"; + version = "0.13.1.1"; + sha256 = "cda662acf9084ef1d16da987bde2fa01c9efc87101e7179da0f566ab05c3a54f"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; @@ -162080,6 +163543,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged-identity" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "tagged-identity"; + version = "0.1.0"; + sha256 = "ba4051456f2d594d128698e052291556608e4c9a57e95ede1962cbc932d82800"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/mrkkrp/tagged-identity"; + description = "Trivial monad transformer that allows identical monad stacks have different types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tagged-list" = callPackage ({ mkDerivation, AbortT-transformers, base, binary, natural-number , type-equality, type-level-natural-number @@ -163398,6 +164873,7 @@ self: { homepage = "https://github.com/akru/telegram-bot#readme"; description = "Telegram Bot microframework for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teleport" = callPackage @@ -164543,8 +166019,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.6.6"; - sha256 = "9c78e53e685b4537a39a4d2bc785df1d0d0ee775085bd532d8ae88d10d4c58b4"; + version = "0.8.6.7"; + sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88"; libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; @@ -165192,8 +166668,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.8.1"; - sha256 = "8bedb4c3aa8b998508d1af4f65e99f4ca53dc3803e58375c324bbff3f5542b6d"; + version = "0.8.3"; + sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f"; libraryHaskellDepends = [ base deepseq text vector ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; @@ -166862,12 +168338,13 @@ self: { ({ mkDerivation, base, process, time }: mkDerivation { pname = "timeconsole"; - version = "0.1.0.0"; - sha256 = "807921c815ca23a86691ae47c445fa9ea2c5cae6aa3ad748debd4314b3f6b97e"; + version = "0.1.0.1"; + sha256 = "519f2c90f2ee0b8d58f26fa67fecb83dc77002ed1ea94007b5c256155e9ff022"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; - description = "Time commands by lines of STDOUT"; + homepage = "https://github.com/xpika/Time-Console"; + description = "time each line of terminal output"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -170527,6 +172004,7 @@ self: { homepage = "https://github.com/fpco/typed-process#readme"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -173963,6 +175441,7 @@ self: { homepage = "https://github.com/bitc/hs-vault-tool"; description = "Utility library for spawning a HashiCorp Vault process"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vaultaire-common" = callPackage @@ -174475,8 +175954,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.3.3.0"; - sha256 = "902cc55e930ba703334425adc6090ce1ad4db38f01143fd9b92eba904c2bc58b"; + version = "0.4.0.0"; + sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -174728,6 +176207,7 @@ self: { homepage = "http://github.com/fmthoma/vgrep#readme"; description = "A pager for grep"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vhd" = callPackage @@ -175255,8 +176735,8 @@ self: { }: mkDerivation { pname = "vte"; - version = "0.13.1.0"; - sha256 = "6dc78551c75c393f2c8b9c463539293214ee788ad73c0623adc69f10b36f4a9d"; + version = "0.13.1.1"; + sha256 = "c38699a626af47be2c15ddcc7c9070fe5b9999fee73e3b479d1bafb96cdd5231"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; @@ -175272,8 +176752,8 @@ self: { }: mkDerivation { pname = "vtegtk3"; - version = "0.13.1.0"; - sha256 = "9da47c606db50183e1d9c19dc6626864a50c2838623836e65084951416452dfe"; + version = "0.13.1.1"; + sha256 = "5a61fe264daddeafe4ef47e6a09a00d323abe16bc8bef23441ac818284623067"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; @@ -175284,42 +176764,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.11.1"; - sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_11_3" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , data-default, deepseq, directory, filepath, hashable, HUnit , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec @@ -175353,7 +176797,6 @@ self: { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -177489,6 +178932,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-th_0_22_6" = callPackage + ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split + , template-haskell, text, web-routes + }: + mkDerivation { + pname = "web-routes-th"; + version = "0.22.6"; + sha256 = "e67472973238f1a6ed31c909e1021311da00a47f9d1c4dd0279bd1fca43eb9fb"; + libraryHaskellDepends = [ + base parsec split template-haskell text web-routes + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; + homepage = "https://github.com/happstack/web-routes-th"; + description = "Support for deriving PathInfo using Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-transformers" = callPackage ({ mkDerivation, base, transformers, web-routes }: mkDerivation { @@ -177809,8 +179270,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.14.2.0"; - sha256 = "3fdfe31a039f6168b0a694963fcdf2014e8928955b6fb88f0ef8f2c403473f51"; + version = "0.14.2.1"; + sha256 = "b80ef2a7d9def4245ec85f6065f62fc19fafe7ca3379a5def86e98eeaea1f550"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk mtl pango text transformers @@ -177825,8 +179286,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkit-javascriptcore"; - version = "0.14.2.0"; - sha256 = "e0add063357a0798d6b40b9f8bab83395094199de3432570e4632a8d71a624e2"; + version = "0.14.2.1"; + sha256 = "ab36d0b283d6126826352fcfdc94a14073c05ad63818b4e3f2806707dc3e3f06"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; @@ -177841,8 +179302,8 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.14.2.0"; - sha256 = "dd3e3bc62b31616681ffcee07df11b30155433a2cc7eea0560af53c7560f1a86"; + version = "0.14.2.1"; + sha256 = "6a71c475efbbfdac1c6d2fec12fb3c986dc13e09e1abdbde3dcf7a20421ab4f6"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers @@ -177857,8 +179318,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkitgtk3-javascriptcore"; - version = "0.14.2.0"; - sha256 = "0eba3872499ca6fc54b24a8205297f01498eca2c7622e76c92458bc018ee1edc"; + version = "0.14.2.1"; + sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; @@ -178505,19 +179966,6 @@ self: { }) {}; "withdependencies" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl }: - mkDerivation { - pname = "withdependencies"; - version = "0.2.3"; - sha256 = "eae91b83a4e93c9e31ba5aca90607234708cb65f247e8bc6813b6f25d3ddb8b7"; - libraryHaskellDepends = [ base conduit containers mtl ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; - homepage = "https://github.com/bartavelle/withdependencies"; - description = "Run computations that depend on one or more elements in a stream"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "withdependencies_0_2_4" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors }: @@ -178532,7 +179980,6 @@ self: { homepage = "https://github.com/bartavelle/withdependencies"; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witherable" = callPackage @@ -180340,14 +181787,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xlsx-tabular_0_1_1" = callPackage + "xlsx-tabular_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx }: mkDerivation { pname = "xlsx-tabular"; - version = "0.1.1"; - sha256 = "b266fd453913fede59a1d27122b675035829de7e7037eaa92de8a1e40f942f7d"; + version = "0.2.0"; + sha256 = "95ee0e839d58131a296580fdb73884a208ed017c9b1bfbda1ad05227ec54db77"; libraryHaskellDepends = [ aeson base bytestring containers data-default lens text xlsx ]; @@ -180830,6 +182277,7 @@ self: { homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-to-json-fast" = callPackage @@ -182715,6 +184163,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-comments" = callPackage @@ -183025,30 +184474,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.4.7.1"; - sha256 = "66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_4_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -183070,7 +184495,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-json" = callPackage @@ -185383,25 +186807,6 @@ self: { }) {inherit (pkgs) zlib;}; "zlib" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, zlib - }: - mkDerivation { - pname = "zlib"; - version = "0.6.1.1"; - sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735"; - revision = "3"; - editedCabalFile = "b5fff98d06289c9c16ab78d994f88f18345ccf7d0ef3e5334bb417d763b07046"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Compression and decompression in the gzip and zlib formats"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zlib;}; - - "zlib_0_6_1_2" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, zlib }: @@ -185416,7 +186821,6 @@ self: { ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage From e70560ff98a6ca4a29ed655fb0cfdde66bf7365d Mon Sep 17 00:00:00 2001 From: Yochai Meir Date: Wed, 2 Nov 2016 08:14:10 +0200 Subject: [PATCH 160/336] rtl8812au: compiles on linux 4.8 --- pkgs/os-specific/linux/rtl8812au/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 56f14b30acd..6b1e93e59df 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Grawp"; repo = "rtl8812au_rtl8821au"; - rev = "9c5b2978ab079081dd1e981353be681a1cf495de"; - sha256 = "0bx1vgs2qldwwhdgklbqz2vy9x4jg7cj3d6w6cpkndkcr7h0m5vz"; + rev = "d716b38abf5ca7da72d2be0adfcebe98cceeda8f"; + sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; }; hardeningDisable = [ "pic" ]; From a7d35fdff34563ca8ccac09e9c4db2fcaa9ef076 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 3 Nov 2016 05:31:24 +0100 Subject: [PATCH 161/336] gitlab: 8.12.6 -> 8.12.8, fix CVE-2016-9086 https://about.gitlab.com/2016/11/02/cve-2016-9086-patches/ --- pkgs/applications/version-management/gitlab/Gemfile | 2 +- .../version-management/gitlab/Gemfile.lock | 3 ++- .../version-management/gitlab/default.nix | 4 ++-- .../applications/version-management/gitlab/gemset.nix | 11 ++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index eb3054dfd5b..f9d95e121f5 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.4' +gem 'gitlab-markup', '~> 1.5.0' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 69f2af4f6f0..0dd9b47ff3e 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -281,6 +281,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) + gitlab-markup (1.5.0) gitlab_git (10.6.6) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -868,8 +869,8 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) + github-markup (~> 1.5.0) gitlab_git (~> 10.6.6) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7d6a85a81aa..92b5b552ec6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.12.6"; + version = "8.12.8"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh"; + sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index bf552b5d4ef..a87d4f92c62 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -937,6 +937,7 @@ type = "gem"; }; version = "1.4.0"; + meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown }; gitlab-flowdock-git-hook = { dependencies = ["flowdock" "gitlab-grit" "multi_json"]; @@ -955,6 +956,14 @@ }; version = "2.8.1"; }; + gitlab-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a"; + type = "gem"; + }; + version = "1.5.0"; + }; gitlab_git = { source = { remotes = ["https://rubygems.org"]; @@ -2821,4 +2830,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} From 7cd1e3d8542ba52c6669ccdc52ccd7c265a0c298 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 3 Nov 2016 10:05:58 +0100 Subject: [PATCH 162/336] atlassian-jira: 7.2.3 -> 7.2.4 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d37463f81a5..d2b3cc1c419 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0237f1x2ir3g6ll0w7fpm6vnccqlx1xr015q37qh693hykyi1hy9"; + sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From 6c2324311e109efbc538e48ff5148b4c1c250bc3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 3 Nov 2016 10:34:17 +0100 Subject: [PATCH 163/336] atlassian-confluence: 5.10.7 -> 6.0.1 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index bcba8ef21c6..5a1c473a43d 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "5.10.7"; + version = "6.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1zzkaps78nqjgriz6i6m7bdnm5srvslq27lr3vk6cizn2xz9nc1b"; + sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; From 8bf8a631b21246ef3e88266349e55d3b993c9d6e Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 3 Nov 2016 20:36:10 +0100 Subject: [PATCH 164/336] pythonPackages.datrie: init at 0.7.1 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfbb731ed61..83865e1247a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5376,6 +5376,23 @@ in { }; }; + datrie = buildPythonPackage rec { + name = "datrie"; + version = "0.7.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/datrie/datrie-${version}.tar.gz"; + sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + }; + meta = { + description = "Super-fast, efficiently stored Trie for Python"; + homepage = "https://github.com/kmike/datrie"; + license = licenses.lgpl2; + maintainers = with maintainers; [ lewo ]; + }; + }; + + distributed = buildPythonPackage rec { name = "distributed-${version}"; From 9c2faaef080f1c84ec655f4e58b11b9bec8f180c Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 3 Nov 2016 20:53:28 +0100 Subject: [PATCH 165/336] emby: 3.0.8300 -> 3.0.8500 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 5a566973787..3813baa6420 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.8300"; + version = "3.0.8500"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8"; + sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc"; }; buildInputs = with pkgs; [ From 6ad9704d916c26c673feddb263d979452f57167b Mon Sep 17 00:00:00 2001 From: Jorge and Stefan Date: Thu, 3 Nov 2016 21:03:52 +0100 Subject: [PATCH 166/336] bitcoin: 0.13.0 -> 0.13.1 --- pkgs/applications/altcoins/bitcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 40d82914bf7..c6490cf67df 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.13.0"; + core_version = "0.13.1"; version = core_version; src = fetchurl { urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda"; + sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib From 5245e4f1c2128021b4ddff521fa147e7bde290fd Mon Sep 17 00:00:00 2001 From: = Date: Tue, 25 Oct 2016 21:20:33 +0200 Subject: [PATCH 167/336] pixiewps: init at 1.2.2 --- pkgs/tools/networking/pixiewps/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/pixiewps/default.nix diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix new file mode 100644 index 00000000000..d9b44cc2311 --- /dev/null +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pixiewps-${version}"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "wiire"; + repo = "pixiewps"; + rev = "v${version}"; + sha256 = "09znnj7p8cks7zxzklkdm4zy2qnp92vhngm9r0zfgawnl2b4r2aw"; + }; + + preBuild = '' + cd src + substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace Makefile --replace "/local" "" + ''; + + meta = { + description = "An offline WPS bruteforce utility"; + homepage = https://github.com/wiire/pixiewps; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.nico202; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8ab2993447..bc3df2d1c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3225,6 +3225,8 @@ in pius = callPackage ../tools/security/pius { }; + pixiewps = callPackage ../tools/networking/pixiewps {}; + pk2cmd = callPackage ../tools/misc/pk2cmd { }; plantuml = callPackage ../tools/misc/plantuml { }; From f14888b2fe6ade1035b0815946d67b0a5cce70f3 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 25 Oct 2016 21:49:08 +0200 Subject: [PATCH 168/336] reaverwps-t6x: init at 1.5.2 --- .../networking/reaver-wps-t6x/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/reaver-wps-t6x/default.nix diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix new file mode 100644 index 00000000000..59d2b04786d --- /dev/null +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps }: + +stdenv.mkDerivation rec { + version = "1.5.2"; + name = "reaver-wps-t6x-${version}"; + + src = fetchFromGitHub { + owner = "t6x"; + repo = "reaver-wps-fork-t6x"; + rev = "v${version}"; + sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b"; + }; + + buildInputs = [ libpcap sqlite pixiewps ]; + + prePatch = "cd src"; + + preInstall = "mkdir -p $out/bin"; + + meta = { + description = "Online and offline brute force attack against WPS"; + homepage = https://github.com/t6x/reaver-wps-fork-t6x; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainer = stdenv.lib.maintainers.nico202; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc3df2d1c6e..31d0cd2c150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3420,6 +3420,8 @@ in rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; + + reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; recordmydesktop = callPackage ../applications/video/recordmydesktop { }; From 9665fa4fd036faf7c2a67ef758428709a2bea7f8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 4 Nov 2016 00:05:52 +0100 Subject: [PATCH 169/336] mesa: 12.0.1 -> 13.0.0 --- pkgs/development/libraries/mesa/default.nix | 10 +++------ .../libraries/mesa/dlopen-absolute-paths.diff | 22 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/dlopen-absolute-paths.diff diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 5ff884fd3c1..3475a5997ea 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "12.0.3"; + version = "13.0.0"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; + sha256 = "09yp4wh89srxqqzsnrqgw4gmx68mgxic5nbrprl6l1l2zzmv9vcl"; }; prePatch = "patchShebangs ."; @@ -51,11 +51,7 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ] ++ optional stdenv.isLinux - (substituteAll { - src = ./dlopen-absolute-paths.diff; - libudev = systemd.lib; - }); + ]; postPatch = '' substituteInPlace src/egl/main/egldriver.c \ diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff deleted file mode 100644 index 9a522657223..00000000000 --- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/loader.c b/loader.c -index 4fdf3c2..69ea22d 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -112,7 +112,7 @@ static void *udev_handle = NULL; - static void * - udev_dlopen_handle(void) - { -- char name[80]; -+ char name[256]; - unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY; - int version; - -@@ -126,7 +126,7 @@ udev_dlopen_handle(void) - /* First try opening an already linked libudev, then try loading one */ - do { - for (version = 1; version >= 0; version--) { -- snprintf(name, sizeof(name), "libudev.so.%d", version); -+ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version); - udev_handle = dlopen(name, flags); - if (udev_handle) - return udev_handle; From d8fc6c75fee1f19e08ddb637ed382d0d95420bf9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:12:39 -0400 Subject: [PATCH 170/336] Remove jdt-sdk The package is dead, the links no longer available. --- pkgs/development/eclipse/jdt-sdk/builder.sh | 7 ------- pkgs/development/eclipse/jdt-sdk/default.nix | 15 --------------- pkgs/top-level/all-packages.nix | 18 ++++++++---------- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100755 pkgs/development/eclipse/jdt-sdk/builder.sh delete mode 100644 pkgs/development/eclipse/jdt-sdk/default.nix diff --git a/pkgs/development/eclipse/jdt-sdk/builder.sh b/pkgs/development/eclipse/jdt-sdk/builder.sh deleted file mode 100755 index 40de662b775..00000000000 --- a/pkgs/development/eclipse/jdt-sdk/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -source $stdenv/setup - -unzip $src -mkdir $out -mv eclipse $out/ diff --git a/pkgs/development/eclipse/jdt-sdk/default.nix b/pkgs/development/eclipse/jdt-sdk/default.nix deleted file mode 100644 index 40d1589f770..00000000000 --- a/pkgs/development/eclipse/jdt-sdk/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation ( rec { - pname = "eclipse-JDT-SDK"; - version = "3.3.2"; - name = "${pname}-${version}"; - - builder = ./builder.sh; - src = fetchurl { - url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-JDT-SDK-3.3.2.zip; - md5 = "f9e513b7e3b609feef28651c07807b17"; - }; - - buildInputs = [unzip]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d0cd2c150..fa49a691215 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2450,13 +2450,13 @@ in enableNpm = false; }; - nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - enableNpm = false; + nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + enableNpm = false; }; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { @@ -3420,7 +3420,7 @@ in rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; - + reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; recordmydesktop = callPackage ../applications/video/recordmydesktop { }; @@ -5694,8 +5694,6 @@ in ecj = callPackage ../development/eclipse/ecj { }; - jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; - jruby = callPackage ../development/interpreters/jruby { }; jython = callPackage ../development/interpreters/jython {}; From 4e50480757d78b6b3a7d4c95923286b07a758a8e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:16:29 -0400 Subject: [PATCH 171/336] Remove abc The package does not build and the links are no longer available --- .../compilers/abc/builder-binjar.sh | 4 - pkgs/development/compilers/abc/builder.sh | 40 ---------- pkgs/development/compilers/abc/default.nix | 79 ------------------- .../compilers/abc/jasmin/builder.sh | 24 ------ .../compilers/abc/jasmin/default.nix | 14 ---- .../compilers/abc/polyglot/builder.sh | 11 --- .../compilers/abc/polyglot/default.nix | 13 --- .../development/compilers/abc/soot/builder.sh | 19 ----- .../compilers/abc/soot/default.nix | 14 ---- pkgs/top-level/all-packages.nix | 2 - 10 files changed, 220 deletions(-) delete mode 100644 pkgs/development/compilers/abc/builder-binjar.sh delete mode 100644 pkgs/development/compilers/abc/builder.sh delete mode 100644 pkgs/development/compilers/abc/default.nix delete mode 100644 pkgs/development/compilers/abc/jasmin/builder.sh delete mode 100644 pkgs/development/compilers/abc/jasmin/default.nix delete mode 100644 pkgs/development/compilers/abc/polyglot/builder.sh delete mode 100644 pkgs/development/compilers/abc/polyglot/default.nix delete mode 100644 pkgs/development/compilers/abc/soot/builder.sh delete mode 100644 pkgs/development/compilers/abc/soot/default.nix diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh deleted file mode 100644 index a954c49aa3f..00000000000 --- a/pkgs/development/compilers/abc/builder-binjar.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/$jarname.jar diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh deleted file mode 100644 index ba594023842..00000000000 --- a/pkgs/development/compilers/abc/builder.sh +++ /dev/null @@ -1,40 +0,0 @@ -source $stdenv/setup - -tar zxvf $src - -cd abc-* - -for p in $patches; do - echo "applying patch $p" - patch -p1 < $p -done - -cat > ant.settings < $out/bin/abc < build-tmp.xml -mv build-tmp.xml build.xml - -cat > ant.settings < ant.settings < Date: Thu, 3 Nov 2016 21:19:01 -0400 Subject: [PATCH 172/336] Remove clanlib Does not build, website no longer exists --- .../development/libraries/clanlib/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/clanlib/default.nix diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix deleted file mode 100644 index d4d46dd696c..00000000000 --- a/pkgs/development/libraries/clanlib/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ -stdenv, fetchurl, zlib, -libpng, libjpeg, libvorbis, libogg, -libX11, xf86vidmodeproto, libXxf86vm, libXmu, mesa -}: - -stdenv.mkDerivation { - name = "clanlib-0.8.0"; - src = fetchurl { - url = http://www.clanlib.org/download/releases-0.8/ClanLib-0.8.0.tgz; - sha256 = "1rjr601h3hisrhvpkrj00wirx5hyfbppv9rla400wx7a42xvvyfy"; - }; - - buildInputs = [zlib libpng libjpeg - libvorbis libogg libX11 - xf86vidmodeproto libXmu - mesa libXxf86vm - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c2ab9cc5e..13a794628fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6655,8 +6655,6 @@ in cl = callPackage ../development/libraries/cl { }; - clanlib = callPackage ../development/libraries/clanlib { }; - classads = callPackage ../development/libraries/classads { }; classpath = callPackage ../development/libraries/java/classpath { From c36a1d650239e5be17a369e7b912f76ffcea7849 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:33:19 -0400 Subject: [PATCH 173/336] paml: 4.2a -> 4.9c --- pkgs/applications/science/biology/paml/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index cec0aa7e5eb..589c2809a93 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.2a"; + version = "4.9c"; name = "paml-${version}"; src = fetchurl { - url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tar.gz"; - sha256 = "0yywyrjgxrpavp50n00l01pl90b7pykgb2k53yrlykz9dnf583pb"; + url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; + sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j"; }; preBuild = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' mkdir -pv $out/bin - cp -v codeml $out/bin + cp -v codeml $out/bin cp -v baseml $out/bin cp -v basemlg $out/bin cp -v chi2 $out/bin @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; - homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; }; } From df76eac6c6b03d87a2ed5e5652fd3b08997634cf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:34:28 -0400 Subject: [PATCH 174/336] Remove mcrl Does not build because source no longer exists --- pkgs/tools/misc/mcrl/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/tools/misc/mcrl/default.nix diff --git a/pkgs/tools/misc/mcrl/default.nix b/pkgs/tools/misc/mcrl/default.nix deleted file mode 100644 index bf5043e8b63..00000000000 --- a/pkgs/tools/misc/mcrl/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, coreutils}: - -stdenv.mkDerivation { - name = "mcrl-2.18.4"; - src = fetchurl { - url = http://homepages.cwi.nl/~mcrl/mcrl-2.18.4.tar.gz ; - sha256 = "0gld7x3cv3y0vwjr1snz24xzr818sj1l2dfn8qhirfyhc7dnnqfw"; - }; - - RMPROG = "${coreutils}/bin/rm -f"; -} - - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13a794628fa..693341380fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -884,8 +884,6 @@ in mathics = pythonPackages.mathics; - mcrl = callPackage ../tools/misc/mcrl { }; - meson = callPackage ../development/tools/build-managers/meson { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; From fd8d9098cbb2b9d6d2de4a3eac29edc6599c34f6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:40:35 -0400 Subject: [PATCH 175/336] Remove emacs stratego mode Does not build, no longer exists --- .../editors/emacs-modes/stratego/builder.sh | 4 ---- .../editors/emacs-modes/stratego/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/stratego/builder.sh delete mode 100644 pkgs/applications/editors/emacs-modes/stratego/default.nix diff --git a/pkgs/applications/editors/emacs-modes/stratego/builder.sh b/pkgs/applications/editors/emacs-modes/stratego/builder.sh deleted file mode 100644 index 7d734ec0888..00000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/emacs/site-lisp -cp $src $out/share/emacs/site-lisp/stratego.el diff --git a/pkgs/applications/editors/emacs-modes/stratego/default.nix b/pkgs/applications/editors/emacs-modes/stratego/default.nix deleted file mode 100644 index bb4078d2d2d..00000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchsvn}: -stdenv.mkDerivation { - name = "stratego-mode"; - builder = ./builder.sh; - src = fetchsvn { - url = https://svn.strategoxt.org/repos/StrategoXT/stratego-editors/trunk/emacs/stratego.el; - rev = 12678; - sha256 = "4ab4ec587550233f29ca08b82fa0a9f7e5b33fc178348037e3ab1816bd60f538"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 693341380fb..2651abd9969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12676,8 +12676,6 @@ in scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; - stratego = callPackage ../applications/editors/emacs-modes/stratego { }; - structuredHaskellMode = haskellPackages.structured-haskell-mode; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; From 20c29806404679faaeb9f77520ea5cdf46c50f1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:43:17 -0400 Subject: [PATCH 176/336] Remove cryopid No longer builds / exists --- pkgs/os-specific/linux/cryopid/default.nix | 39 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/cryopid/default.nix diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix deleted file mode 100644 index 0cb64bcc975..00000000000 --- a/pkgs/os-specific/linux/cryopid/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, zlibStatic}: - -let - - pname = "cryopid"; - version = "20090908"; - revision = "7da69201d50e"; - -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://sharesource.org/hg/cryopid/archive/${revision}.tar.bz2"; - sha256 = "908a4b1cb26322ee25afe13ff59e0d86f669538cb4583766b15ca79fda6c69ca"; - }; - - buildInputs = [ zlibStatic ]; - - preBuild = "cd src"; - - installPhase = "mkdir -p $out/bin; cp cryopid $out/bin"; - - meta = { - description = "A process freezer for Linux"; - longDescription = '' - CryoPID allows you to capture the state of a running process in Linux - and save it to a file. This file can then be used to resume the process - later on, either after a reboot or even on another machines. - ''; - homepage = http://sharesource.org/project/cryopid; - license = '' - Modified BSD license (without advertising clause). CryoPID ships with - and links against the dietlibc library, which is distributed under the - GNU General Public Licence, version 2. - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2651abd9969..8b7a1afbea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10566,8 +10566,6 @@ in cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; - cryopid = callPackage ../os-specific/linux/cryopid { }; - criu = callPackage ../os-specific/linux/criu { }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; From 4e9186aaf3e5fca2f3f5e2a774a6f23630eb5e35 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:47:09 -0400 Subject: [PATCH 177/336] liblastfm: 0.3.2 -> 0.5 --- pkgs/development/libraries/liblastfmSF/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 99f94bb8225..efe93ec02df 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: stdenv.mkDerivation rec { - name = "liblastfm-SF-0.3.2"; + name = "liblastfm-SF-0.5"; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl openssl ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/liblastfm-0.3.2.tar.gz"; - sha256 = "1hk62giysi96h6cyjyph69nlv1v4vw45w3sx7i2m89i9aysd6qp7"; + url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz"; + sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; meta = { From 6d11e8ed4ca0e501894438cba1241c18a93d7c3d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:58:47 -0400 Subject: [PATCH 178/336] Remove pal2nal No longer build/exists --- .../science/biology/pal2nal/default.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/applications/science/biology/pal2nal/default.nix diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix deleted file mode 100644 index 956f8b07e98..00000000000 --- a/pkgs/applications/science/biology/pal2nal/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, perl, paml}: - -stdenv.mkDerivation { - name = "pal2nal-12"; - src = fetchurl { - url = http://coot.embl.de/pal2nal/distribution/pal2nal.v12.tar.gz; - sha256 = "1qj9sq5skpa7vyccl9gxc5ls85jwiq8j6mr8wvacz4yhyg0afy04"; - }; - - installPhase = '' - mkdir -p $out/bin - - cp -v pal2nal.pl $out/bin - - mkdir -p $out/doc - - cp -v README $out/doc - ''; - - meta = { - description = "Program for aligning nucleotide sequences based on an aminoacid alignment"; - longDescription = '' - PAL2NAL is a program that converts a multiple sequence alignment of proteins and the corresponding DNA (or mRNA) sequences into a codon alignment. The program automatically assigns the corresponding codon sequence even if the input DNA sequence has mismatches with the input protein sequence, or contains UTRs, polyA tails. It can also deal with frame shifts in the input alignment, which is suitable for the analysis of pseudogenes. The resulting codon alignment can further be subjected to the calculation of synonymous (KS) and non-synonymous (KA) substitution rates. - -If the input is a pair of sequences, PAL2NAL automatically calculates KS and KA by the codeml program in PAML. -''; - license = "non-commercial"; - homepage = http://coot.embl.de/pal2nal/; - pkgMaintainer = "Pjotr Prins"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b7a1afbea5..60066d71964 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16340,8 +16340,6 @@ in paml = callPackage ../applications/science/biology/paml { }; - pal2nal = callPackage ../applications/science/biology/pal2nal { }; - plink = callPackage ../applications/science/biology/plink/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; From ac44a1b6aaceee6f2070cd5e3baf14053caf0d0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:02:28 -0400 Subject: [PATCH 179/336] Remove jetty_util --- .../libraries/java/jetty-util/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/java/jetty-util/default.nix diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix deleted file mode 100644 index 349339aad44..00000000000 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-util-6.1.16"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar; - sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60066d71964..5e2e02e74c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7424,8 +7424,6 @@ in jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; - jetty_util = callPackage ../development/libraries/java/jetty-util { }; - jshon = callPackage ../development/tools/parsing/jshon { }; json_glib = callPackage ../development/libraries/json-glib { }; From 66bdac04e8e5f860c2d598a37645b4309c925b4e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:02:48 -0400 Subject: [PATCH 180/336] Remove jetty_gwt --- .../libraries/java/jetty-gwt/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/java/jetty-gwt/default.nix diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix deleted file mode 100644 index 03433048270..00000000000 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-gwt-6.1.14"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-gwt/6.1.14/jetty-gwt-6.1.14.jar; - sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e2e02e74c9..04aa5e01930 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7422,8 +7422,6 @@ in jemalloc = callPackage ../development/libraries/jemalloc { }; - jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; - jshon = callPackage ../development/tools/parsing/jshon { }; json_glib = callPackage ../development/libraries/json-glib { }; From ad43f28e0752c65e9c9b81c85d803877e4745c84 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:07:54 -0400 Subject: [PATCH 181/336] Remove Selenium Remote Control No longer builds and was a dodgy process anyways --- .../tools/selenium/remote-control/default.nix | 49 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 54 deletions(-) delete mode 100644 pkgs/development/tools/selenium/remote-control/default.nix diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix deleted file mode 100644 index fbe11ed2bc0..00000000000 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, jre }: - -# let version = "1.0-beta-2"; -let version = "1.0-SNAPSHOT-standalone"; - -in stdenv.mkDerivation { - /* - - Use this if there is another release.. - - name = "selenium-remote-control-${version}-dist"; - src = fetchurl { - url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip"; - sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41"; - }; - buildInputs = [unzip]; - phases = "unpackPhase buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - mv * $out/lib - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@" - EOF - chmod +x "$bin" - ''; - */ - - # this snapshot version starts a firefox from a script file. It only issues a warning about it - # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such.. - name = "selenium-remote-control-${version}-dist"; - # this dist file has been created using mvn package -Dmaven.test.skip=true based on svn rev 2450 - src = fetchurl { - url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar"; - sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38"; - }; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - cp $src $out/lib/ - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar "$out/lib/$(basename $src)" "\$@" - EOF - chmod +x "$bin" - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04aa5e01930..405c2e7a155 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,11 +6337,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - # couldn't find the source yet - seleniumRCBin = callPackage ../development/tools/selenium/remote-control { - jre = jdk; - }; - selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; From 67f5e76030a9ac6eaa566e8e6fbfba0824d4db0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:15:11 -0400 Subject: [PATCH 182/336] felix-remoteshell: 1.0.4 -> 1.1.2 --- pkgs/servers/felix/remoteshell.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 6e8089d32e9..3ac3c98718f 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -1,14 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "apache-felix-remoteshell-bundle-1.0.4"; + version = "1.1.2"; + name = "apache-felix-remoteshell-bundle-${version}"; src = fetchurl { - url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar; - sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb"; + url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; + sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; }; - buildCommand = + buildCommand = '' mkdir -p $out/bundle - cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar + cp ${src} $out/bundle/org.apache.felix.shell.remote-${version}.jar ''; } From f10064be45264491e68b0720a2d651686c79494f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:27:09 -0400 Subject: [PATCH 183/336] dxflib: 2.5.0.0-1 -> 3.12.2 --- pkgs/development/libraries/dxflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index f9c58857731..832b013123d 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.5.0.0-1"; + version = "3.12.2"; name = "dxflib-${version}"; src = fetchurl { url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; From 943f161fc54ce4a4ca2411eafc76dab716b03c6d Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:03:18 +0900 Subject: [PATCH 184/336] ghost-one module: use enum --- nixos/modules/services/games/ghost-one.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix index 5762148df2b..71ff6bb2f3f 100644 --- a/nixos/modules/services/games/ghost-one.nix +++ b/nixos/modules/services/games/ghost-one.nix @@ -21,8 +21,7 @@ in language = mkOption { default = "English"; - type = types.addCheck types.str - (lang: elem lang [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]); + type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; }; From 5a3c2e3db07218957784ec16dcea2c5d75c9337b Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:03:53 +0900 Subject: [PATCH 185/336] bitlbee module: use enum --- nixos/modules/services/networking/bitlbee.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 5e6847097a9..e72ea20ccce 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -7,11 +7,6 @@ let cfg = config.services.bitlbee; bitlbeeUid = config.ids.uids.bitlbee; - authModeCheck = v: - v == "Open" || - v == "Closed" || - v == "Registered"; - bitlbeeConfig = pkgs.writeText "bitlbee.conf" '' [settings] @@ -67,7 +62,7 @@ in authMode = mkOption { default = "Open"; - type = types.addCheck types.str authModeCheck; + type = types.enum [ "Open" "Closed" "Registered" ]; description = '' The following authentication modes are available: Open -- Accept connections from anyone, use NickServ for user authentication. From 8f8184ece16f54b874996196a15191470ffa3fc1 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:04:17 +0900 Subject: [PATCH 186/336] tinc module: use enum --- nixos/modules/services/networking/tinc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index b26d30597b1..f8e68fda7fc 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -68,7 +68,7 @@ in interfaceType = mkOption { default = "tun"; - type = types.addCheck types.str (n: n == "tun" || n == "tap"); + type = types.enum [ "tun" "tap" ]; description = '' The type of virtual interface used for the network connection ''; From 797d40767ddb121e49fa0ee2e224c64bdcb376a3 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:04:52 +0900 Subject: [PATCH 187/336] fcgiwrap module: use enum --- nixos/modules/services/web-servers/fcgiwrap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 2c5e433003c..a64a187255a 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -21,7 +21,7 @@ in { }; socketType = mkOption { - type = types.addCheck types.str (t: t == "unix" || t == "tcp" || t == "tcp6"); + type = types.enum [ "unix" "tcp" "tcp6" ]; default = "unix"; description = "Socket type: 'unix', 'tcp' or 'tcp6'."; }; From 80b854739c57debee887aaf4efa9fb113916ae49 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:05:13 +0900 Subject: [PATCH 188/336] grub module: use enum --- nixos/modules/system/boot/loader/grub/grub.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c3be7407d59..17c842ddc53 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -324,8 +324,7 @@ in fsIdentifier = mkOption { default = "uuid"; - type = types.addCheck types.str - (type: type == "uuid" || type == "label" || type == "provided"); + type = types.enum [ "uuid" "label" "provided" ]; description = '' Determines how GRUB will identify devices when generating the configuration file. A value of uuid / label signifies that grub From ffc0e2f4fc63f3a2d028dbd7d981223fb19cbeb4 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:05:44 +0900 Subject: [PATCH 189/336] network-interfaces module: use enum --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index aae4dc5fdad..1faa8abd5f7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -245,7 +245,7 @@ let virtualType = mkOption { default = null; - type = types.nullOr (types.addCheck types.str (v: v == "tun" || v == "tap")); + type = with types; nullOr (enum [ "tun" "tap" ]); description = '' The explicit type of interface to create. Accepts tun or tap strings. Also accepts null to implicitly detect the type of device. From 4bfa6989f0a1e644ea9d1e96543e2edd7f5db56e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2016 08:58:01 +0100 Subject: [PATCH 190/336] wineUnstable: 1.9.20 -> 1.9.22 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 40845a0988c..f3b12dc48f8 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.20"; + version = "1.9.22"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97"; + sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl"; + sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 83c1e8a0201e6992da340acb78b53a2a234dbaa3 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 11:54:03 +0300 Subject: [PATCH 191/336] pythonPackages.bitbucket_api: fixes #19988 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37243a3e7ef..3075f30f3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2630,13 +2630,15 @@ in { bitbucket_api = buildPythonPackage rec { name = "bitbucket-api-0.4.4"; + # python3 does not support relative imports + disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/b/bitbucket-api/${name}.tar.gz"; sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2"; }; - propagatedBuildInputs = with self; [ requests_oauth2 nose sh ]; + propagatedBuildInputs = with self; [ requests_oauthlib nose sh ]; doCheck = false; From a43f24cb4f096675a2d27980a3f0241feb0bf5d7 Mon Sep 17 00:00:00 2001 From: Igor Sharonov Date: Fri, 4 Nov 2016 11:55:47 +0300 Subject: [PATCH 192/336] pythonPackages.requests_oauth2: refactors dependencies --- pkgs/top-level/python-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3075f30f3a3..48af01c54b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21702,13 +21702,17 @@ in { requests_oauth2 = buildPythonPackage rec { name = "requests-oauth2-0.1.1"; + # python3 does not support relative imports + disabled = isPy3k; src = pkgs.fetchurl { url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; }; - propagatedBuildInputs = with self; [ requests_oauthlib ]; + propagatedBuildInputs = with self; [ requests2 ]; + # no tests in tarball + doCheck = false; meta = { description = "Python's Requests OAuth2 (Open Authentication) plugin"; From 7fae93fa762d8057cbf3a05886b03316b8d8b4c0 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 4 Nov 2016 10:13:46 +0100 Subject: [PATCH 193/336] scala: fix hash --- pkgs/development/compilers/scala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index adee23531e0..decbf678c34 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1g34fw2nib9bzk1qw68a4wvh4zy09y5yqvnlq4yw250f6lqfi17r"; + sha256 = "085k7zl9v3vxaqwq0r0yyj53cb6syvq2safn4fgz3w00ks2fyxw2"; }; propagatedBuildInputs = [ jre ] ; From 2e3b9a063a2ee7d695288471c6af5603b70df404 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Wed, 2 Nov 2016 18:49:10 +0000 Subject: [PATCH 194/336] heapdict: init at 1.0.0 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03593957481..f9247bdef6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5394,6 +5394,22 @@ in { }; }; + heapdict = buildPythonPackage rec { + name = "HeapDict-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/H/HeapDict/${name}.tar.gz"; + sha256 = "0nhvxyjq6fp6zd7jzmk5x4fg6xhakqx9lhkp5yadzkqn0rlf7ja0"; + }; + doCheck = !isPy3k; + meta = { + description = "a heap with decrease-key and increase-key operations."; + homepage = http://stutzbachenterprises.com; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; distributed = buildPythonPackage rec { From 45d7aa6c32a181883ec50248d89d773b6b1dd0fe Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Wed, 2 Nov 2016 18:49:24 +0000 Subject: [PATCH 195/336] zict: init at 0.0.3 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9247bdef6c..ec739f75cac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5411,6 +5411,26 @@ in { }; }; + zict = buildPythonPackage rec { + + name = "zict-${version}"; + version = "0.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/z/zict/${name}.tar.gz"; + sha256 = "1xsrlzrih0qmxvxqhk2c5vhzxirf509fppzdfyardl50jpsllni6"; + }; + + propagatedBuildInputs = with self; [ heapdict ]; + + meta = { + description = "Mutable mapping tools."; + homepage = https://github.com/dask/zict; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; + }; + distributed = buildPythonPackage rec { name = "distributed-${version}"; From 54976c5c1bb23fba501b17f97a3f08e06452e181 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Wed, 2 Nov 2016 13:59:46 +0000 Subject: [PATCH 196/336] distributed: 1.10.0 -> 1.13.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec739f75cac..b01b05e7cbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5434,17 +5434,17 @@ in { distributed = buildPythonPackage rec { name = "distributed-${version}"; - version = "1.10.0"; + version = "1.13.3"; src = pkgs.fetchurl { url = "mirror://pypi/d/distributed/${name}.tar.gz"; - sha256 = "11bp2rs52fhcqlgyrlh3cf31ck07mys38mrkf98vjl380lyjj357"; + sha256 = "0nka6hqz986j1fhvfmxffgvmnxh66giq9a3ml58jsaf0riq9mjrc"; }; buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado - psutil botocore + psutil botocore zict lz4 ] ++ (if !isPy3k then [ singledispatch ] else []); # py.test not picking up local config file, even when running From c5cac5051af83b41c3601e7e7116f7b49c8dd010 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Fri, 4 Nov 2016 20:52:28 +1000 Subject: [PATCH 197/336] cjdns v17.3 -> v18 --- pkgs/tools/networking/cjdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 32cf5750c6a..1c91235652a 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, nodejs, which, python27, utillinux }: -let version = "17.3"; in +let version = "18"; in stdenv.mkDerivation { name = "cjdns-"+version; src = fetchurl { url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri"; + sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; }; buildInputs = [ which python27 nodejs ] ++ From 2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 4 Nov 2016 12:24:57 +0100 Subject: [PATCH 198/336] Revert "Merge pull request #20090 from sternenseemann/master" Reason: https://github.com/NixOS/nixpkgs/pull/20090#commitcomment-19686426 This reverts commit 9ffcb1b2503303bfdb4a8fc31c8e4160184eb74c, reversing changes made to a6283c1126676d30de3abfb3ee8865505da0ed43. --- .../instant-messengers/jackline/default.nix | 37 --------------- .../ocaml-modules/astring/default.nix | 43 ----------------- .../ocaml-modules/cstruct/default.nix | 44 +++++------------ .../ocaml-modules/erm_xmpp/0.3.nix | 29 ------------ .../janestreet/ppx-sexp-conv.nix | 4 +- .../ocaml-modules/nocrypto/default.nix | 33 +++++-------- .../ocaml-modules/notty/default.nix | 36 -------------- .../development/ocaml-modules/otr/default.nix | 43 ----------------- .../ocaml-modules/ptime/default.nix | 47 ------------------- .../development/ocaml-modules/tls/default.nix | 41 ---------------- .../ocaml-modules/uuseg/default.nix | 21 +++++---- .../ocaml-modules/uutf/default.nix | 26 ++++------ .../ocaml-modules/x509/default.nix | 28 +++++------ pkgs/top-level/all-packages.nix | 4 -- pkgs/top-level/ocaml-packages.nix | 22 +-------- 15 files changed, 62 insertions(+), 396 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/jackline/default.nix delete mode 100644 pkgs/development/ocaml-modules/astring/default.nix delete mode 100644 pkgs/development/ocaml-modules/erm_xmpp/0.3.nix delete mode 100644 pkgs/development/ocaml-modules/notty/default.nix delete mode 100644 pkgs/development/ocaml-modules/otr/default.nix delete mode 100644 pkgs/development/ocaml-modules/ptime/default.nix delete mode 100644 pkgs/development/ocaml-modules/tls/default.nix diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix deleted file mode 100644 index b6ac19fdc37..00000000000 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchFromGitHub, ocamlPackages}: - -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; - -stdenv.mkDerivation rec { - version = "2016-10-30"; - name = "jackline-${version}"; - - src = fetchFromGitHub { - owner = "hannesm"; - repo = "jackline"; - rev = "8d829b03f2cdad6b13260ad293aeaa44075bd894"; - sha256 = "1xsngldyracfb15jxa9h5qnpaywv6bn8gkg0hzccycjz1nfskl17"; - }; - - buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv - erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib_p4 hex uutf opam - ]; - - buildPhase = with ocamlPackages; '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build \ - --pinned true - ''; - - installPhase = '' - opam-installer --prefix=$out --script | sh - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/hannesm/jackline; - description = "Terminal-based XMPP client in pure OCaml."; - license = licenses.bsd2; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix deleted file mode 100644 index 3c603b659a2..00000000000 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}: - -buildOcaml rec { - version = "0.8.3"; - name = "astring"; - - src = fetchurl { - url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; - sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; - }; - - unpackCmd = "tar -xf $curSrc"; - - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; - - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build - ''; - - installPhase = '' - opam-installer --script --prefix=$out astring.install | sh - ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; - - meta = { - homepage = http://erratique.ch/software/ptime; - description = "Alternative String module for OCaml."; - longDescription = '' - Astring exposes an alternative String module for OCaml. This module tries - to balance minimality and expressiveness for basic, index-free, string - processing and provides types and functions for substrings, string sets - and string maps. - - Remaining compatible with the OCaml String module is a non-goal. - The String module exposed by Astring has exception safe functions, removes - deprecated and rarely used functions, alters some signatures and names, - adds a few missing functions and fully exploits OCaml's newfound string - immutability. - ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 0c011bab0fd..c9f04918d17 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,40 +1,20 @@ -{stdenv, buildOcaml, fetchFromGitHub, writeText, - ocaml, ocplib-endian, sexplib_p4, findlib, ounit, camlp4, - async_p4 ? null, lwt ? null, ppx_tools ? null, - withAsync ? true, withLwt ? true, withPpx ? true}: +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, + async_p4 ? null, lwt ? null, camlp4}: -with stdenv.lib; -assert withAsync -> async_p4 != null; -assert withLwt -> lwt != null; -assert withPpx -> ppx_tools != null; +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; -buildOcaml rec { - name = "cstruct"; - version = "2.3.0"; +stdenv.mkDerivation { + name = "ocaml-cstruct-1.6.0"; - minimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cstruct"; - rev = "v${version}"; - sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; + src = fetchurl { + url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz; + sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece"; }; - configureFlags = [ "--enable-tests" ] ++ - optional withLwt [ "--enable-lwt" ] ++ - optional withAsync [ "--enable-async" ] ++ - optional withPpx ["--enable-ppx"]; - configurePhase = "./configure --prefix $out $configureFlags"; - - buildInputs = [ ocaml findlib camlp4 ounit ]; - propagatedBuildInputs = [ocplib-endian sexplib_p4 ] ++ - optional withPpx ppx_tools ++ - optional withAsync async_p4 ++ - optional withLwt lwt; - - doCheck = true; - checkTarget = "test"; + configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ + (if async_p4 != null then ["--enable-async"] else [])); + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix deleted file mode 100644 index 9a57c3f7b27..00000000000 --- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto, camlp4 }: - -buildOcaml rec { - version = "0.3"; - name = "erm_xmpp"; - - src = fetchFromGitHub { - owner = "hannesm"; - repo = "xmpp"; - rev = "eee18bd3dd343550169969c0b45548eafd51cfe1"; - sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5"; - }; - - buildInputs = [ ocaml findlib camlp4 ]; - propagatedBuildInputs = [ erm_xml nocrypto ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; - - meta = { - homepage = https://github.com/hannesm/xmpp; - description = "OCaml based XMPP implementation (fork)."; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index 729e28e2d2f..bf4a7b214de 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,10 +1,10 @@ {stdenv, buildOcamlJane, - ppx_core, ppx_tools, ppx_type_conv, sexplib_p4}: + ppx_core, ppx_tools, ppx_type_conv, sexplib}: buildOcamlJane rec { name = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; - propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib_p4 ]; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; meta = with stdenv.lib; { description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index b56d04b062c..f8db935b612 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,30 +1,20 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, type_conv, zarith, ounit, ocaml_oasis, ppx_sexp_conv -, lwt ? null -, withLwt ? true}: +{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: -with stdenv.lib; -assert withLwt -> lwt != null; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; -buildOcaml rec { - name = "nocrypto"; - version = "0.5.3"; +stdenv.mkDerivation rec { + name = "ocaml-nocrypto-${version}"; + version = "0.5.1"; - minimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-nocrypto"; - rev = "v${version}"; - sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; + src = fetchzip { + url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; + sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; }; - buildInputs = [ ocaml ocaml_oasis findlib type_conv ounit ppx_sexp_conv ]; - propagatedBuildInputs = [ cstruct zarith ] ++ optional withLwt lwt; - - configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; - - configurePhase = "./configure --prefix $out $configureFlags"; + buildInputs = [ ocaml findlib type_conv ounit ]; + propagatedBuildInputs = [ cstruct zarith ]; + configureFlags = "--enable-tests"; doCheck = true; checkTarget = "test"; createFindlibDestdir = true; @@ -32,6 +22,7 @@ buildOcaml rec { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix deleted file mode 100644 index 431004b41b4..00000000000 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib -, result, uucp, uuseg, uutf -, withLwt ? true -, lwt ? null }: - -with stdenv.lib; -assert withLwt -> lwt != null; - -buildOcaml rec { - version = "0.1.1"; - name = "notty"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "pqwy"; - repo = "notty"; - rev = "v${version}"; - sha256 = "0bw3bq8z2y1rhc20zn13s78sazywyzpg8nmyjch33p7ypxfglf01"; - }; - - buildInputs = [ findlib ]; - propagatedBuildInputs = [ result uucp uuseg uutf ] ++ - optional withLwt lwt; - - configureFlags = [ "--enable-unix" ] ++ - optional withLwt ["--enable-lwt"]; - configurePhase = "./configure --prefix $out $configureFlags"; - - meta = with stdenv.lib; { - homepage = https://github.com/pqwy/notty/tree/master; - description = "Declarative terminal graphics for OCaml."; - license = licenses.isc; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix deleted file mode 100644 index 08620754128..00000000000 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam, - ppx_tools, ppx_sexp_conv, cstruct, sexplib_p4, result, nocrypto, astring}: - -let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in - -buildOcaml rec { - name = "otr"; - version = "0.3.3"; - - minimumSupportedOcamlVersion = "4.02.2"; - - src = fetchFromGitHub { - owner = "hannesm"; - repo = "ocaml-otr"; - rev = "${version}"; - sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr"; - }; - - buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ]; - propagatedBuildInputs = [ cstruct sexplib_p4 result nocrypto astring ]; - - buildPhase = '' - ocaml ${ocamlFlags} pkg/pkg.ml build \ - --tests true - ''; - - installPhase = '' - opam-installer --prefix=$out --script | sh - ln -s $out/lib/otr $out/lib/ocaml/${ocaml.version}/site-lib - ''; - - doCheck = true; - checkPhase = "ocaml ${ocamlFlags} pkg/pkg.ml test"; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - homepage = https://github.com/hannesm/ocaml-otr; - description = "Off-the-record (OTR) messaging protocol, purely in OCaml."; - license = licenses.bsd2; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix deleted file mode 100644 index bb850019731..00000000000 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}: - -let ocaml-version = stdenv.lib.getVersion ocaml; in - -buildOcaml rec { - version = "0.8.2"; - name = "ptime"; - - src = fetchurl { - url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj"; - }; - - unpackCmd = "tar -xf $curSrc"; - - buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; - - propagatedBuildInputs = [ result ]; - - buildPhase = '' - ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false - ''; - - installPhase = '' - opam-installer --script --prefix=$out ptime.install | sh - ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib - ''; - - meta = { - homepage = http://erratique.ch/software/ptime; - description = "POSIX time for OCaml."; - longDescription = '' - Ptime has platform independent POSIX time support in pure OCaml. - It provides a type to represent a well-defined range of POSIX timestamps - with picosecond precision, conversion with date-time values, conversion - with RFC 3339 timestamps and pretty printing to a human-readable, - locale-independent representation. - - The additional Ptime_clock library provides access to a system POSIX clock - and to the system's current time zone offset. - - Ptime is not a calendar library. - ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix deleted file mode 100644 index 52a9aec90b2..00000000000 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis -, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct -, withLwt ? true -, lwt ? null}: - -with stdenv.lib; -assert withLwt -> lwt != null; - -buildOcaml rec { - version = "0.7.1"; - name = "tls"; - - minimunSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-tls"; - rev = "${version}"; - sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24"; - }; - - buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ]; - propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ - optional withLwt lwt; - - configureFlags = [ "--disable-mirage" "--enable-tests" ] ++ - optional withLwt ["--enable-lwt"]; - - configurePhase = "./configure --prefix $out $configureFlags"; - - doCheck = true; - checkTarget = "test"; - createFindlibDestdir = true; - - meta = with stdenv.lib; { - homepage = https://github.com/mirleft/ocaml-tls; - description = "TLS in pure OCaml."; - license = licenses.bsd2; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 2ba3dd02683..3c7a4ff5c58 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,39 +1,40 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let + inherit (stdenv.lib) getVersion versionAtLeast; + pname = "uuseg"; + version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { +assert versionAtLeast (getVersion ocaml) "4.01"; - minimumSupportedOcamlVersion = "4.01"; +stdenv.mkDerivation { - name = pname; - version = "0.9.0"; + name = "ocaml-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ uucp uutf cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; + propagatedBuildInputs = [ uucp uutf ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; buildPhase = '' - ocaml pkg/git.ml ocaml pkg/build.ml \ native=true native-dynlink=true \ uutf=true cmdliner=true ''; installPhase = '' - opam-installer --prefix $out --script | sh - ln -s $out/lib/uuseg $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index bdddf7d16b6..fda630114ed 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,38 +1,32 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, cmdliner}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uutf"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { - name = pname; - version = "0.9.4"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - minimumSupportedOcamlVersion = "3.12"; +stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1f71fyawxal42x6g82539bv0ava2smlar6rmxxz1cyq3l0i6fw0k"; + sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; }; buildInputs = [ ocaml findlib ocamlbuild opam ]; - propagatedBuildInputs = [ cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/git.ml - ocaml pkg/build.ml \ - native=true \ - native-dynlink=true \ - cmdliner=true - ''; + buildPhase = "./pkg/build true"; installPhase = '' - opam-installer --prefix=$out --script | sh - ln -s $out/lib/uutf $out/lib/ocaml/${ocaml.version}/site-lib/ + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index bca266d5fee..c44ccb18982 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,30 +1,28 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: +{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }: -buildOcaml rec { - name = "x509"; - version = "0.5.3"; +let version = "0.5.0"; in - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-x509"; - rev = "${version}"; - sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; +stdenv.mkDerivation { + name = "ocaml-x509-${version}"; + + src = fetchzip { + url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz"; + sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + buildInputs = [ ocaml findlib ounit ]; propagatedBuildInputs = [ asn1-combinators nocrypto ]; configureFlags = "--enable-tests"; - configurePhase = "./configure --prefix $out $configureFlags"; - doCheck = true; checkTarget = "test"; createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - license = licenses.bsd2; - maintainers = with maintainers; [ vbgl ]; + platforms = ocaml.meta.platforms or []; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d0cd2c150..a4a4abe60d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13257,10 +13257,6 @@ in hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; - }; - slack = callPackage ../applications/networking/instant-messengers/slack { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2c83fe81737..d4ca17f6dbd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -22,8 +22,6 @@ let asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; - astring = callPackage ../development/ocaml-modules/astring { }; - async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; async_find = callPackage ../development/ocaml-modules/async_find { }; @@ -158,8 +156,6 @@ let erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; - erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { }; - estring = callPackage ../development/ocaml-modules/estring { }; ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { @@ -261,13 +257,7 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { - lwt = ocaml_lwt; - }; - - notty = callPackage ../development/ocaml-modules/notty { - lwt = ocaml_lwt; - }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; @@ -345,15 +335,11 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; - otr = callPackage ../development/ocaml-modules/otr { }; - ounit = callPackage ../development/ocaml-modules/ounit { }; piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; - ptime = callPackage ../development/ocaml-modules/ptime { }; - re2_p4 = callPackage ../development/ocaml-modules/re2 { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -374,10 +360,6 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - tls = callPackage ../development/ocaml-modules/tls { - lwt = ocaml_lwt; - }; - type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; @@ -653,7 +635,7 @@ let then { tools = pkgs.pkgsi686Linux.stdenv.cc; } else {} ); - + glsurf = callPackage ../applications/science/math/glsurf { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; From bb082c5ca6c79a56e5d5f9ec97cf8e39c029904b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 4 Nov 2016 12:39:03 +0100 Subject: [PATCH 199/336] pythonPackages.git-webhook: init at 2016-03-11 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03593957481..c0830ece079 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11880,6 +11880,28 @@ in { }; }; + github-webhook = buildPythonPackage rec { + name = "github-webhook-${version}"; + version = "unstable-2016-03-11"; + + # There is a PyPI package but an older one. + src = pkgs.fetchgit { + url = "https://github.com/bloomberg/python-github-webhook.git"; + rev = "ca1855479ee59c4373da5425dbdce08567605d49"; + sha256 = "0mqwig9281iyzbphp1d21a4pqdrf98vs9k8lqpqx6spzgqaczx5f"; + }; + + propagatedBuildInputs = with self; [ flask ]; + # No tests + doCheck = false; + + meta = { + description = "A framework for writing webhooks for GitHub"; + license = licenses.mit; + homepage = https://github.com/bloomberg/python-github-webhook; + }; + }; + goobook = buildPythonPackage rec { name = "goobook-1.9"; disabled = isPy3k; From 222cfd32333c95682287040dcf66af8ed3694b0d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 4 Nov 2016 13:34:40 +0100 Subject: [PATCH 200/336] cjdns module: fix typo --- nixos/modules/services/networking/cjdns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 5e15e40ea0c..b293cba737a 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -36,7 +36,7 @@ let echo \'\' ${concatStringsSep "\n" (mapAttrsToList (k: v: optionalString (v.hostname != "") - "echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}") + "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} echo \'\' ''); From daf3ba426b2558e73ef2742fab1a73c782ef62a6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 4 Nov 2016 13:37:38 +0100 Subject: [PATCH 201/336] cjdns test: exercise host builder logic --- nixos/tests/cjdns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index f61c82b916a..1cedf168dcb 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -57,6 +57,7 @@ import ./make-test.nix ({ pkgs, ...} : { connectTo."192.168.0.1:1024}" = { password = carolPassword; publicKey = carolPubKey; + hostname = "carol"; }; }; }; From 967d3c11922d9e27ded9b7025a7144924aba4171 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Fri, 4 Nov 2016 01:15:45 -0400 Subject: [PATCH 202/336] racket release 6.7 The attached patch advances racket to the latest released version 6.7 From 30a1d275376ed2f156314c5f99c4a4a9ba69d2b4 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Fri, 4 Nov 2016 01:13:58 -0400 Subject: [PATCH] racket : advance to the latest release 6.7 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8e462ffaacc..c7472076814 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1kzdi1n6h6hmz8zd9k8r5a5yp2ryi4w3c2fjm1k6cqicn18cwaxz"; + sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy"; }; FONTCONFIG_FILE = fontsConf; From e6b054faabf9fc9fe7c5e829ba6c6c16f99bbea7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:32:08 -0400 Subject: [PATCH 203/336] Remove cowsay Sources no longer exist --- pkgs/tools/misc/cowsay/default.nix | 23 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/tools/misc/cowsay/default.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix deleted file mode 100644 index a9bdf1b2b92..00000000000 --- a/pkgs/tools/misc/cowsay/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, perl }: - -stdenv.mkDerivation { - name = "cowsay-3.03"; - - src = fetchurl { - url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; - }; - - buildInputs = [ perl ]; - - installPhase = '' - bash ./install.sh $out - ''; - - meta = { - description = "A program which generates ASCII pictures of a cow with a message"; - homepage = http://www.nog.net/~tony/warez/cowsay.shtml; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rob ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 405c2e7a155..affa35f137e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1132,8 +1132,6 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; - cowsay = callPackage ../tools/misc/cowsay { }; - cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; From b054276eb48414059302421e0c0cc5b2444cbfc8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:36:57 -0400 Subject: [PATCH 204/336] qjson: Moved to GitHub --- pkgs/development/libraries/qjson/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index e69ae5f98f7..1d4da00bf4c 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "qjson-0.8.1"; + version = "0.8.1"; + name = "qjson-${version}"; - src = fetchurl { - url = "mirror://sourceforge/qjson/${name}.tar.bz2"; - sha256 = "1n8lr2ph08yhcgimf4q1pnkd4z15v895bsf3m68ljz14aswvakfd"; + src = fetchFromGitHub { + owner = "flavio"; + repo = "qjson"; + rev = "${version}"; + sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59"; }; buildInputs = [ cmake qt4 ]; From 893bfb1a1bca99ff0d6ed47804f6f8d841442edf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:41:01 -0400 Subject: [PATCH 205/336] Remove fuse-zip Original sources have moved to BitBucket but clearly this is not used by anybody --- pkgs/tools/filesystems/fuse-zip/default.nix | 23 ------------------- pkgs/tools/filesystems/fuse-zip/libzip.patch | 24 -------------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 50 deletions(-) delete mode 100644 pkgs/tools/filesystems/fuse-zip/default.nix delete mode 100644 pkgs/tools/filesystems/fuse-zip/libzip.patch diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix deleted file mode 100644 index a5ac74fe47a..00000000000 --- a/pkgs/tools/filesystems/fuse-zip/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }: - -stdenv.mkDerivation rec { - name = "fuse-zip-0.2.13"; - - src = fetchurl { - url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz"; - sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b"; - }; - - patches = [ ./libzip.patch ]; # problems with new libzip; from Gentoo - - buildInputs = [ pkgconfig fuse libzip zlib ]; - - makeFlags = "INSTALLPREFIX=$(out)"; - - meta = { - homepage = http://code.google.com/p/fuse-zip/; - description = "A FUSE-based filesystem that allows read and write access to ZIP files"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/filesystems/fuse-zip/libzip.patch b/pkgs/tools/filesystems/fuse-zip/libzip.patch deleted file mode 100644 index f2348e5f1ba..00000000000 --- a/pkgs/tools/filesystems/fuse-zip/libzip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp ---- fuse-zip-0.2.13/lib/bigBuffer.cpp 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp 2011-09-28 21:40:01.294946957 -0400 -@@ -236,7 +236,7 @@ - len = offset; - } - --ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) { -+zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) { - CallBackStruct *b = (CallBackStruct*)state; - switch (cmd) { - case ZIP_SOURCE_OPEN: { -diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h ---- fuse-zip-0.2.13/lib/bigBuffer.h 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.h 2011-09-28 21:40:23.203719133 -0400 -@@ -52,7 +52,7 @@ - * never called because read() always successfull. - * See zip_source_function(3) for details. - */ -- static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd); -+ static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd); - - /** - * Return number of chunks needed to keep 'offset' bytes. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c328f74729e..b825c113245 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -47,7 +47,6 @@ doNotDisplayTwice rec { firefoxWrapper = firefox; # 2015-09 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 - fuse_zip = fuse-zip; # added 2016-04-27 gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 googleAuthenticator = google-authenticator; # added 2016-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index affa35f137e..eb784fa0bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1720,8 +1720,6 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - fuse-zip = callPackage ../tools/filesystems/fuse-zip { }; - exfat = callPackage ../tools/filesystems/exfat { }; dos2unix = callPackage ../tools/text/dos2unix { }; From 82bdd012447dedf661bf36c006e429da0adfbce1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:56:19 -0400 Subject: [PATCH 206/336] Remove iksemel Sources no longer exist --- .../development/libraries/iksemel/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/iksemel/default.nix diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix deleted file mode 100644 index 7e8061ee8bb..00000000000 --- a/pkgs/development/libraries/iksemel/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: - -stdenv.mkDerivation rec { - name = "iksemel-${version}"; - version = "1.4"; - - src = fetchurl { - url = "https://iksemel.googlecode.com/files/${name}.tar.gz"; - sha1 = "722910b99ce794fd3f6f0e5f33fa804732cf46db"; - }; - - preConfigure = '' - sed -i -e '/if.*gnutls_check_version/,/return 1;/c return 0;' configure - export LIBGNUTLS_CONFIG="${pkgconfig}/bin/pkg-config gnutls" - ''; - - buildInputs = [ pkgconfig gnutls zlib ]; - - meta = { - homepage = "https://code.google.com/p/iksemel/"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "Fast and portable XML parser and Jabber protocol library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb784fa0bc7..485efed5a51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7353,8 +7353,6 @@ in id3lib = callPackage ../development/libraries/id3lib { }; - iksemel = callPackage ../development/libraries/iksemel { }; - ilbc = callPackage ../development/libraries/ilbc { }; ilixi = callPackage ../development/libraries/ilixi { }; From 1368ff89a0b5e832a1d7b2cda4f5a4ad1fda2587 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:14:00 -0400 Subject: [PATCH 207/336] remake: 3.82 -> 4.1 --- pkgs/development/tools/build-managers/remake/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 676354a6e8d..7a199cc925a 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { name = "remake-${version}"; - version = "3.82+dbg-0.6"; + remakeVersion = "4.1"; + dbgVersion = "1.1"; + version = "${remakeVersion}+dbg-${dbgVersion}"; src = fetchurl { - url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2"; - sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz"; + url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg${dbgVersion}.tar.bz2"; + sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; buildInputs = [ readline ]; From 39f0404fdbc3efe3bab2931c65b82b3381ff0ce3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 3 Nov 2016 21:11:01 -0500 Subject: [PATCH 208/336] kde5.plasma: 5.8.2 -> 5.8.3 --- pkgs/desktops/kde-5/plasma/fetch.sh | 2 +- pkgs/desktops/kde-5/plasma/srcs.nix | 320 ++++++++++++++-------------- 2 files changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index a5ddcf35677..0809f2d6693 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 5fc836f10a8..08daf740183 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz"; - sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd"; - name = "bluedevil-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz"; + sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6"; + name = "bluedevil-5.8.3.tar.xz"; }; }; breeze = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz"; - sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8"; - name = "breeze-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz"; + sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp"; + name = "breeze-5.8.3.tar.xz"; }; }; breeze-grub = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz"; - sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1"; - name = "breeze-grub-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz"; + sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k"; + name = "breeze-grub-5.8.3.tar.xz"; }; }; breeze-gtk = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz"; - sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k"; - name = "breeze-gtk-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz"; + sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g"; + name = "breeze-gtk-5.8.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz"; - sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r"; - name = "breeze-plymouth-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz"; + sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3"; + name = "breeze-plymouth-5.8.3.tar.xz"; }; }; discover = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz"; - sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04"; - name = "discover-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz"; + sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh"; + name = "discover-5.8.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz"; - sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc"; - name = "kactivitymanagerd-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz"; + sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj"; + name = "kactivitymanagerd-5.8.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz"; - sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca"; - name = "kde-cli-tools-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz"; + sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b"; + name = "kde-cli-tools-5.8.3.tar.xz"; }; }; kdecoration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz"; - sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766"; - name = "kdecoration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz"; + sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca"; + name = "kdecoration-5.8.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz"; - sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7"; - name = "kde-gtk-config-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz"; + sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d"; + name = "kde-gtk-config-5.8.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz"; - sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq"; - name = "kdeplasma-addons-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz"; + sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3"; + name = "kdeplasma-addons-5.8.3.tar.xz"; }; }; kgamma5 = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz"; - sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn"; - name = "kgamma5-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz"; + sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065"; + name = "kgamma5-5.8.3.tar.xz"; }; }; khotkeys = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz"; - sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5"; - name = "khotkeys-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz"; + sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9"; + name = "khotkeys-5.8.3.tar.xz"; }; }; kinfocenter = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz"; - sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865"; - name = "kinfocenter-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz"; + sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv"; + name = "kinfocenter-5.8.3.tar.xz"; }; }; kmenuedit = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz"; - sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21"; - name = "kmenuedit-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz"; + sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7"; + name = "kmenuedit-5.8.3.tar.xz"; }; }; kscreen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz"; - sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr"; - name = "kscreen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz"; + sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny"; + name = "kscreen-5.8.3.tar.xz"; }; }; kscreenlocker = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz"; - sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1"; - name = "kscreenlocker-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz"; + sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv"; + name = "kscreenlocker-5.8.3.tar.xz"; }; }; ksshaskpass = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz"; - sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s"; - name = "ksshaskpass-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz"; + sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj"; + name = "ksshaskpass-5.8.3.tar.xz"; }; }; ksysguard = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz"; - sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn"; - name = "ksysguard-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz"; + sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd"; + name = "ksysguard-5.8.3.tar.xz"; }; }; kwallet-pam = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz"; - sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb"; - name = "kwallet-pam-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz"; + sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd"; + name = "kwallet-pam-5.8.3.tar.xz"; }; }; kwayland-integration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz"; - sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa"; - name = "kwayland-integration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz"; + sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4"; + name = "kwayland-integration-5.8.3.tar.xz"; }; }; kwin = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz"; - sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y"; - name = "kwin-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz"; + sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w"; + name = "kwin-5.8.3.tar.xz"; }; }; kwrited = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz"; - sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23"; - name = "kwrited-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz"; + sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9"; + name = "kwrited-5.8.3.tar.xz"; }; }; libkscreen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz"; - sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c"; - name = "libkscreen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz"; + sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7"; + name = "libkscreen-5.8.3.tar.xz"; }; }; libksysguard = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz"; - sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l"; - name = "libksysguard-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz"; + sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy"; + name = "libksysguard-5.8.3.tar.xz"; }; }; milou = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz"; - sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9"; - name = "milou-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz"; + sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl"; + name = "milou-5.8.3.tar.xz"; }; }; oxygen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz"; - sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar"; - name = "oxygen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz"; + sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg"; + name = "oxygen-5.8.3.tar.xz"; }; }; plasma-desktop = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz"; - sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj"; - name = "plasma-desktop-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz"; + sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7"; + name = "plasma-desktop-5.8.3.tar.xz"; }; }; plasma-integration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz"; - sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf"; - name = "plasma-integration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz"; + sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23"; + name = "plasma-integration-5.8.3.tar.xz"; }; }; plasma-nm = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz"; - sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22"; - name = "plasma-nm-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz"; + sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7"; + name = "plasma-nm-5.8.3.tar.xz"; }; }; plasma-pa = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz"; - sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi"; - name = "plasma-pa-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz"; + sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4"; + name = "plasma-pa-5.8.3.tar.xz"; }; }; plasma-sdk = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz"; - sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y"; - name = "plasma-sdk-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz"; + sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7"; + name = "plasma-sdk-5.8.3.tar.xz"; }; }; plasma-tests = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz"; - sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5"; - name = "plasma-tests-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz"; + sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4"; + name = "plasma-tests-5.8.3.tar.xz"; }; }; plasma-workspace = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz"; - sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44"; - name = "plasma-workspace-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz"; + sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb"; + name = "plasma-workspace-5.8.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz"; - sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi"; - name = "plasma-workspace-wallpapers-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz"; + sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2"; + name = "plasma-workspace-wallpapers-5.8.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.2"; + version = "1-5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz"; - sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f"; - name = "polkit-kde-agent-1-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz"; + sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z"; + name = "polkit-kde-agent-1-5.8.3.tar.xz"; }; }; powerdevil = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz"; - sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x"; - name = "powerdevil-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz"; + sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1"; + name = "powerdevil-5.8.3.tar.xz"; }; }; sddm-kcm = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz"; - sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3"; - name = "sddm-kcm-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz"; + sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d"; + name = "sddm-kcm-5.8.3.tar.xz"; }; }; systemsettings = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz"; - sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi"; - name = "systemsettings-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz"; + sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm"; + name = "systemsettings-5.8.3.tar.xz"; }; }; user-manager = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz"; - sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91"; - name = "user-manager-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz"; + sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v"; + name = "user-manager-5.8.3.tar.xz"; }; }; } From c431c392333f949622cf1a12df9386cdf0fd84b1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:23:38 -0400 Subject: [PATCH 209/336] siproxd: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/siproxd/cheaders.patch | 5 +++-- pkgs/applications/networking/siproxd/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch index 53c4813cc33..69a3e328737 100644 --- a/pkgs/applications/networking/siproxd/cheaders.patch +++ b/pkgs/applications/networking/siproxd/cheaders.patch @@ -3,11 +3,12 @@ index 1904ab3..cb3624d 100644 --- a/src/dejitter.c +++ b/src/dejitter.c @@ -22,6 +22,8 @@ - + #include - + +#include +#include + #include #include #include #include diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 69ebab78f94..14ed2587e63 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { - name = "siproxd-0.8.1"; - + name = "siproxd-0.8.2"; + src = fetchurl { url = "mirror://sourceforge/siproxd/${name}.tar.gz"; - sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz"; + sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; }; patches = [ ./cheaders.patch ]; From 628531a783f2b466348a833cfdad7808b608b74c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:24:44 -0400 Subject: [PATCH 210/336] Remove minmay Sources no longer exist --- pkgs/development/libraries/minmay/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/minmay/default.nix diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix deleted file mode 100644 index 4518b4dd760..00000000000 --- a/pkgs/development/libraries/minmay/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl }: - -stdenv.mkDerivation rec { - name = "minmay-${version}"; - version = "1.0.0"; - - src = fetchurl { - url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz"; - sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2"; - }; - - buildInputs = [ cmake openssl ]; - - meta = { - homepage = "https://github.com/mazhe/minmay"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "An XMPP library (forked from the iksemel project)"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 485efed5a51..62d605e2728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8469,8 +8469,6 @@ in minizip = callPackage ../development/libraries/minizip { }; - minmay = callPackage ../development/libraries/minmay { }; - miro = callPackage ../applications/video/miro { avahi = avahi.override { withLibdnssdCompat = true; From 7329435fabee51840edbf2435b250a8dd5107eb0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:27:01 -0400 Subject: [PATCH 211/336] Remove jing No longer exists --- pkgs/tools/text/xml/jing/default.nix | 22 ---------------------- pkgs/tools/text/xml/jing/unzip-builder.sh | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 38 deletions(-) delete mode 100644 pkgs/tools/text/xml/jing/default.nix delete mode 100755 pkgs/tools/text/xml/jing/unzip-builder.sh diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix deleted file mode 100644 index 5737fff14f5..00000000000 --- a/pkgs/tools/text/xml/jing/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, unzip, jre }: - -stdenv.mkDerivation { - name = "jing-20091111"; - builder = ./unzip-builder.sh; - - src = fetchurl { - url = https://jing-trang.googlecode.com/files/jing-20091111.zip; - sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap"; - }; - - inherit unzip jre; - - meta = with stdenv.lib; { - description = "A RELAX NG validator in Java"; - # The homepage is www.thaiopensource.com, but it links to googlecode.com - # for downloads and call it the "project site". - homepage = http://www.thaiopensource.com/relaxng/jing.html; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh deleted file mode 100755 index c02920e5a69..00000000000 --- a/pkgs/tools/text/xml/jing/unzip-builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -set -e -source $stdenv/setup - -$unzip/bin/unzip $src -mkdir -p $out -mv $name/* $out - -cat > "$out/bin/jing" < Date: Fri, 4 Nov 2016 10:54:09 -0400 Subject: [PATCH 212/336] Remove trang Source no longer exists --- pkgs/tools/text/xml/trang/builder.sh | 15 --------------- pkgs/tools/text/xml/trang/default.nix | 24 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 41 deletions(-) delete mode 100644 pkgs/tools/text/xml/trang/builder.sh delete mode 100644 pkgs/tools/text/xml/trang/default.nix diff --git a/pkgs/tools/text/xml/trang/builder.sh b/pkgs/tools/text/xml/trang/builder.sh deleted file mode 100644 index 9fe712360ba..00000000000 --- a/pkgs/tools/text/xml/trang/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -unzip -j $src '*/trang.jar' -cp -p *.jar $out/jars - -mkdir -p $out/bin - -cat >> $out/bin/trang < Date: Fri, 4 Nov 2016 11:10:21 -0400 Subject: [PATCH 213/336] gsoap: 2.8.16 -> 2.8.37 --- pkgs/development/libraries/gsoap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index d1140319611..bf1d29dae0e 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.16"; + version = "2.8.37"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gSOAP/gsoap_${version}.zip"; - sha256 = "00lhhysa9f9ychkvn1ij0ngr54l1dl9ww801yrliwq5c05gql7a6"; + url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; + sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3"; }; buildInputs = [ unzip m4 bison flex openssl zlib ]; From cc7c28332b3d795c7a806024f051317795bd1b9d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:18:52 -0400 Subject: [PATCH 214/336] Remove ttysnoop No longer exists --- pkgs/os-specific/linux/ttysnoop/default.nix | 38 ------------------- .../linux/ttysnoop/default.upstream | 3 -- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/ttysnoop/default.nix delete mode 100644 pkgs/os-specific/linux/ttysnoop/default.upstream diff --git a/pkgs/os-specific/linux/ttysnoop/default.nix b/pkgs/os-specific/linux/ttysnoop/default.nix deleted file mode 100644 index 670c9608344..00000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="ttysnoop"; - version="0.12d.k26"; - name="${baseName}-${version}"; - hash="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - url="http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz"; - sha256="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - preBuild = '' - sed -e "s@/sbin@$out/sbin@g" -i Makefile - sed -e "s@/usr/man@$out/share/man@g" -i Makefile - mkdir -p "$out/share/man/man8" - mkdir -p "$out/sbin" - ''; - postInstall = '' - mkdir -p "$out/etc" - cp snooptab.dist "$out/etc/snooptab" - ''; - meta = { - inherit (s) version; - description = "A tool to clone input and output of another tty/pty to the current one"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/ttysnoop/default.upstream b/pkgs/os-specific/linux/ttysnoop/default.upstream deleted file mode 100644 index 905a639c31e..00000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://sysd.org/stas/node/35 -ensure_choice -version '.*-([0-9a-z.]+)[.]tar[.].*' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f49dae92bf..8984fa925e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3920,8 +3920,6 @@ in ttyrec = callPackage ../tools/misc/ttyrec { }; - ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; - ttylog = callPackage ../tools/misc/ttylog { }; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; From 1120f2a2b7192bb823da8fde27d24300c12d3c41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:23:43 -0400 Subject: [PATCH 215/336] xc3sprog: 748 -> 787 --- pkgs/development/tools/misc/xc3sprog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 52471c30fd0..8f3f6c1b22a 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -4,12 +4,12 @@ # prebuilt binary subversion snapshots on sourceforge. stdenv.mkDerivation rec { - version = "748"; # latest @ 2013-10-26 + version = "787"; name = "xc3sprog-${version}"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; - sha256 = "0wkz6094kkqz91qpa24pzlbhndc47sjmqhwk3p7ccabv0041rzk0"; + sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; }; From 198a69fcb76a7e2f578399c6e81985c6dafdf154 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:29:22 -0400 Subject: [PATCH 216/336] tintin: 2.00.9 -> 2.01.1 --- pkgs/games/tintin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index c2bc9d37b4f..deb283c57c4 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.00.9"; + name = "tintin-2.01.1"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0x8jakxx7hh7b0z6vjcxyrda0afbz2s2yy7mvrbxjffyc2dyxzna"; + sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; }; buildInputs = [ zlib pcre ]; From 3bb889c34bb3f3a11c9116b33123d1765d375284 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:30:17 -0400 Subject: [PATCH 217/336] Remove g500-control Sources no longer available --- pkgs/tools/misc/g500-control/default.nix | 34 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/tools/misc/g500-control/default.nix diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix deleted file mode 100644 index 9d42c7d68d5..00000000000 --- a/pkgs/tools/misc/g500-control/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "g500-control-0.0.1"; - - src = fetchurl { - url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz"; - sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb"; - }; - - unpackPhase = '' - mkdir -p g500-control - tar -C g500-control/ -xf $src - ''; - - buildPhase = '' - cd g500-control - gcc -o g500-control *.c - ''; - - installPhase = '' - mkdir -p $out/bin/ - cp g500-control $out/bin/ - ''; - - meta = { - homepage = http://code.google.com/p/g500-control/; - description = "Configure Logitech G500's internal profile under Linux"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8984fa925e5..6672f3550a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1726,8 +1726,6 @@ in uni2ascii = callPackage ../tools/text/uni2ascii { }; - g500-control = callPackage ../tools/misc/g500-control { }; - galculator = callPackage ../applications/misc/galculator { gtk = gtk3; }; From d9134ddb5d8aceb656d62354593583fc5338f2af Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 4 Nov 2016 16:33:47 +0100 Subject: [PATCH 218/336] Add a package option for quassel (#20159) --- nixos/modules/services/networking/quassel.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 99269c49e8f..3f0906fdb80 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,8 +3,8 @@ with lib; let - quassel = pkgs.kde4.quasselDaemon; cfg = config.services.quassel; + quassel = cfg.package; user = if cfg.user != null then cfg.user else "quassel"; in @@ -23,6 +23,15 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.kde4.quasselDaemon; + description = '' + The package of the quassel daemon. + ''; + example = pkgs.quasselDaemon; + }; + interfaces = mkOption { default = [ "127.0.0.1" ]; description = '' From ee2d5a3758daeadfb2c02487436bf95a35bd0f20 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 4 Nov 2016 10:41:52 -0500 Subject: [PATCH 219/336] plasma-framework: include patch for OSD dialog flag Include an upstream patch to fix an annoying bug where OSD windows have the dialog flag set, causing OSDs associated with auto-hiding panels to be invisible. --- .../libraries/kde-frameworks/plasma-framework.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 60910b0d678..fe5ba503a40 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kactivities, karchive +{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui @@ -8,6 +8,13 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + (fetchurl { + url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5"; + sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f"; + name = "plasma-framework-osd-no-dialog.patch"; + }) + ]; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons From d91eba4ec39020f1a04fefa4bccda21953db760c Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Fri, 4 Nov 2016 18:49:40 +0300 Subject: [PATCH 220/336] Update PULL_REQUEST_TEMPLATE.md Follow the rebranding of OS X into macOS --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 981ed156b34..3482ae16e26 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ on non-NixOS) - Built on platform(s) - [ ] NixOS - - [ ] OS X + - [ ] macOS - [ ] Linux - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) From 20e81f7c0d56e0b179115ca72a85b81ff637d909 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Sat, 5 Nov 2016 01:22:17 +1000 Subject: [PATCH 221/336] nixos/cjdns: tightened permissions via systemd, added caps --- nixos/modules/services/networking/cjdns.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index b293cba737a..7e981183353 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -245,7 +245,10 @@ in serviceConfig = { Type = "forking"; Restart = "on-failure"; - + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; + AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; + ProtectSystem = "full"; + MemoryDenyWriteExecute = true; ProtectHome = true; PrivateTmp = true; }; From 0ddba5a99ec0b2abaf61a96c260a9ee045742661 Mon Sep 17 00:00:00 2001 From: Aaron Bull Schaefer Date: Fri, 4 Nov 2016 09:15:58 -0700 Subject: [PATCH 222/336] pythonPackages.ansible2: 2.1.2.0 -> 2.2.0.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0830ece079..ba644d634a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -927,13 +927,13 @@ in { }; ansible2 = buildPythonPackage rec { - version = "2.1.2.0"; + version = "2.2.0.0"; name = "ansible-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "1sr12ryn2dc28009bkfl6f8rp94ychbr9i7wlf6an1bw76ysfdww"; + sha256 = "11l5814inr44ammp0sh304rqx2382fr629c0pbwf0k1rjg99iwfr"; }; prePatch = '' From 92ee96e20ec74b94ecf7560441d4c1dfd54cd28f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 4 Nov 2016 18:51:36 +0100 Subject: [PATCH 223/336] pythonPackages.pandas: 0.19.0 -> 0.19.1 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0830ece079..c01cfb84347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17569,21 +17569,18 @@ in { }; }; - pandas = self.pandas_18; - - pandas_18 = let + pandas = let inherit (pkgs.stdenv.lib) optional optionalString; inherit (pkgs.stdenv) isDarwin; in buildPythonPackage rec { name = "pandas-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pandas/${name}.tar.gz"; - sha256 = "4697606cdf023c6b7fcb74e48aaf25cf282a1a00e339d2d274cf1b663748805b"; + sha256 = "2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421"; }; - LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; propagatedBuildInputs = with self; [ From 16242a7c63608bb3aec2104a9bf6292dee93cc27 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 4 Nov 2016 19:06:45 +0100 Subject: [PATCH 224/336] ocamlPackages.sedlex: init at 1.99.3 sedlex is a Unicode-friendly lexer generator for OCaml. Homepage: https://github.com/alainfrisch/sedlex --- .../ocaml-modules/sedlex/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/sedlex/default.nix diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix new file mode 100644 index 00000000000..5dbc74ef543 --- /dev/null +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools }: + +assert stdenv.lib.versionAtLeast ocaml.version "4.02"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${version}"; + version = "1.99.3"; + + src = fetchzip { + url = "http://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz"; + sha256 = "1wghjy3qyj43ll1ikchlqy7fv2hxcn3ap9xgsscm2ch09d8dcv7y"; + }; + + buildInputs = [ ocaml findlib ppx_tools ]; + + propagatedBuildInputs = [ gen ]; + + buildFlags = [ "all" "opt" ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/alainfrisch/sedlex; + description = "An OCaml lexer generator for Unicode"; + license = stdenv.lib.licenses.mit; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d4ca17f6dbd..b86ac44bd65 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -429,6 +429,8 @@ let safepass = callPackage ../development/ocaml-modules/safepass { }; + sedlex = callPackage ../development/ocaml-modules/sedlex { }; + sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; stringext = callPackage ../development/ocaml-modules/stringext { }; From 3f0e1f4c83729111544f5aedb1f18f0e8bee0dbe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 2 Nov 2016 14:35:40 +0100 Subject: [PATCH 225/336] ocaml-ptime: init at 0.8.2 --- .../ocaml-modules/ptime/default.nix | 45 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ptime/default.nix diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix new file mode 100644 index 00000000000..b8017134e52 --- /dev/null +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}: + +buildOcaml rec { + version = "0.8.2"; + name = "ptime"; + + src = fetchurl { + url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; + sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj"; + }; + + unpackCmd = "tar -xf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + propagatedBuildInputs = [ result ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false + ''; + + installPhase = '' + opam-installer --script --prefix=$out ptime.install | sh + ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib + ''; + + meta = { + homepage = http://erratique.ch/software/ptime; + description = "POSIX time for OCaml"; + longDescription = '' + Ptime has platform independent POSIX time support in pure OCaml. + It provides a type to represent a well-defined range of POSIX timestamps + with picosecond precision, conversion with date-time values, conversion + with RFC 3339 timestamps and pretty printing to a human-readable, + locale-independent representation. + + The additional Ptime_clock library provides access to a system POSIX clock + and to the system's current time zone offset. + + Ptime is not a calendar library. + ''; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b86ac44bd65..d2c41d89a62 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -340,6 +340,8 @@ let piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + ptime = callPackage ../development/ocaml-modules/ptime { }; + re2_p4 = callPackage ../development/ocaml-modules/re2 { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; From 43f2c86eee7dd53ab79cb5afecc18e10fb2a8464 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2016 20:32:46 +0100 Subject: [PATCH 226/336] configuration-hackage2nix.yaml: add older version of haskell-src-exts for hoogle --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 57aeca52bda..e135987a4cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2011,7 +2011,7 @@ extra-packages: - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - - hoogle < 5 # required by current implementation of ghcWithHoogle + - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 From 7b26af844f8791ab1dd7c66ebc839a65b337f909 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2016 18:36:09 +0100 Subject: [PATCH 227/336] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/780f9e49c9053051f5a63739bb5afa744574df6e. --- .../haskell-modules/hackage-packages.nix | 376 ++++++++++++------ 1 file changed, 256 insertions(+), 120 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3555db97d23..e45070068ee 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42961,8 +42961,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-split"; - version = "0.0.0.2"; - sha256 = "d3ceb9e47a1fb94a797bcc393bd665c37ac5a8232dc14e421c3cc38ec219e5ed"; + version = "0.0.1"; + sha256 = "60793c8eeff1fa0fe03910951d1925f3c66aec61ead64bf3f98dd6110a05b8e7"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -52965,8 +52965,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.19"; - sha256 = "eb58a68fee918486e6ef884e946898427a75ddc6c3d1d509dd9a475341b6daa7"; + version = "1.1.20"; + sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -55143,8 +55143,8 @@ self: { pname = "download-curl"; version = "0.1.4"; sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1"; - revision = "1"; - editedCabalFile = "7e6df1d4f39879e9b031c8ff5e2f6fd5be3729cc40f7515e117ac0b47ed3f675"; + revision = "2"; + editedCabalFile = "d4df109a694aacf11814f7d0ea8df2aa6b187ea894f1e6ae1bddae635f0a4e0c"; libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ]; homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; @@ -70045,27 +70045,25 @@ self: { }) {}; "github" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + ({ mkDerivation, aeson, aeson-compat, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions , file-embed, hashable, hspec, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, transformers, transformers-compat + , semigroups, text, time, tls, transformers, transformers-compat , unordered-containers, vector, vector-instances }: mkDerivation { pname = "github"; - version = "0.14.1"; - sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d"; - revision = "1"; - editedCabalFile = "a03fc2c579eb4451933e82486f705a81480c030eb17c47c4bccd07fb1e302584"; + version = "0.15.0"; + sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat base16-bytestring - binary binary-orphans byteable bytestring containers cryptohash - deepseq deepseq-generics exceptions hashable http-client - http-client-tls http-link-header http-types iso8601-time mtl - network-uri semigroups text time transformers transformers-compat - unordered-containers vector vector-instances + aeson aeson-compat base base-compat base16-bytestring binary + binary-orphans byteable bytestring containers cryptohash deepseq + deepseq-generics exceptions hashable http-client http-client-tls + http-link-header http-types iso8601-time mtl network-uri semigroups + text time tls transformers transformers-compat unordered-containers + vector vector-instances ]; testHaskellDepends = [ aeson-compat base base-compat file-embed hspec unordered-containers @@ -70567,6 +70565,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_0_1_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.1.3.0"; + sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + homepage = "https://github.com/MichelBoucey/glabrous"; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }: mkDerivation { @@ -75318,13 +75338,13 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.1"; - sha256 = "588c64add3715a78cac2e80ccd37ba501d03d27f43acbf8b98a4a5cb2c8a55d1"; + version = "1.5.2"; + sha256 = "d56ae799ff03d5c4a4350d260be822cd3b3ff6fc8ed5e4b04f513579485fc9ca"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - homepage = "https://github.com/mhwombat/gray-extended"; + homepage = "https://github.com/mhwombat/gray-extended#readme"; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75447,14 +75467,14 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.6"; - sha256 = "a511a0146446018536176c84e5a134c9bc5ad477717c24bff3e92d52d40bf352"; + version = "7.8.7"; + sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework test-framework-quickcheck2 ]; - homepage = "https://github.com/mhwombat/grid"; + homepage = "https://github.com/mhwombat/grid#readme"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -78609,8 +78629,8 @@ self: { }: mkDerivation { pname = "hakyll-sass"; - version = "0.2.1"; - sha256 = "859f91a9fe1d0f4a0bc75c1cd49bf2246aca8d45381f9405068d8588d6533039"; + version = "0.2.2"; + sha256 = "14e3076b7921f37ecd0edf736be931536705461b66755387ec7813aa5e3e8302"; libraryHaskellDepends = [ aeson-pretty base data-default-class filepath hakyll hsass ]; @@ -81624,6 +81644,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts_1_18_2" = callPackage + ({ mkDerivation, array, base, containers, cpphs, directory + , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck + , tasty, tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.18.2"; + sha256 = "31583804dcec5c200bcf184db8a2eb33fdcc3354b011c6485370be63b2710943"; + libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + doCheck = false; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts_1_19_0" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck @@ -81769,8 +81811,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.2.0.0"; - sha256 = "146c5b9501b6ee3d48085531afdca768f25448771ab1f35565dd336b22e3421b"; + version = "0.3.0.1"; + sha256 = "5eab56307a8f415114da1c891e1753ccfe7febe8fe04c0280a8eb5b4e20c8728"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -81834,22 +81876,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-backend-ghc" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.3.0.1"; + sha256 = "a63cd589f21a534bd0e68f27307a791f2257ab6e8eca7c76832a26e2b17868a3"; + libraryHaskellDepends = [ + base bytestring containers ghc haskell-tools-ast mtl references + safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tools-cli" = callPackage - ({ mkDerivation, base, containers, directory, ghc, ghc-paths - , haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, mtl, references, split + ({ mkDerivation, base, containers, directory, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, references, split }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.2.0.0"; - sha256 = "fb59c74aae296cf598e7dd19634aa57037966e4a3cace373ed6abd449229f44d"; - isLibrary = false; + version = "0.3.0.1"; + sha256 = "0e60a276383fff8b9cceda6fe82d45001156db5d3888b1914b16b04280f697b2"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base containers directory ghc ghc-paths haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor mtl references split ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base directory filepath HUnit ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; @@ -81859,20 +81921,19 @@ self: { "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-ast-fromghc, haskell-tools-ast-trf - , haskell-tools-prettyprint, haskell-tools-refactor, http-types - , mtl, references, transformers, wai, wai-websockets, warp - , websockets + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, mtl, references, transformers + , wai, wai-websockets, warp, websockets }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.2.0.0"; - sha256 = "2c70c5dc92fd4ce296a6035a7a4d2471cbc372a4dcf5735590082cbd9e926dd4"; + version = "0.3.0.1"; + sha256 = "9c85cd53b3cb18a1f6355b1d7f9c9f702ad82cead9f6b2e2d20d4ff1de5ca744"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-trf + haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor http-types mtl references transformers wai wai-websockets warp websockets ]; @@ -81883,16 +81944,15 @@ self: { }) {}; "haskell-tools-prettyprint" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast - , haskell-tools-ast-trf, mtl, references, split + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.2.0.0"; - sha256 = "ae846bb46ae3c42de8393eb1341b66d654f3a672f3ec7fc0bac3c24d0dbdd76e"; + version = "0.3.0.1"; + sha256 = "13356a19d14a0d0c6a95b0ec56600fd4166dcee23ddef80fe0913b5d734ade5c"; libraryHaskellDepends = [ - base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl - references split + base containers ghc haskell-tools-ast mtl references split uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Pretty printing of Haskell-Tools AST"; @@ -81903,26 +81963,26 @@ self: { "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-ast-fromghc, haskell-tools-ast-gen - , haskell-tools-ast-trf, haskell-tools-prettyprint, HUnit, mtl - , polyparse, references, split, template-haskell, time - , transformers, uniplate + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, HUnit, mtl, old-time, polyparse + , references, split, template-haskell, time, transformers, uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.2.0.0"; - sha256 = "1572b88c516512d5d5cb2c94f25ef90cc17dac8db121f374551f4eabc9979723"; + version = "0.3.0.1"; + sha256 = "0fc7d41b05d130f57681f90a571ad9e112186a3fe5395c6ecc4575814aa8b2f5"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen - haskell-tools-ast-trf haskell-tools-prettyprint mtl references + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references split template-haskell transformers uniplate ]; testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen - haskell-tools-ast-trf haskell-tools-prettyprint HUnit mtl polyparse - references split template-haskell time transformers uniplate + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite HUnit mtl old-time + polyparse references split template-haskell time transformers + uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -81930,6 +81990,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast + , haskell-tools-prettyprint, mtl, references + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.3.0.1"; + sha256 = "190e3aaa5a2a77e4106dd7ae243605b5036b82848197d0ab747c91b89a6b3aa6"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -89678,41 +89755,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_4_2_43" = callPackage - ({ mkDerivation, aeson, array, base, binary, blaze-builder - , bytestring, Cabal, case-insensitive, cmdargs, conduit, containers - , deepseq, directory, filepath, haskell-src-exts, http-types - , old-locale, parsec, process, QuickCheck, random, resourcet, safe - , shake, tagsoup, temporary, text, time, transformers, uniplate - , unix, vector, vector-algorithms, wai, warp - }: - mkDerivation { - pname = "hoogle"; - version = "4.2.43"; - sha256 = "eb30df565d363cd5d98821c51b0daf93493dec3bfe95c016922c95a20efa7c17"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary blaze-builder bytestring case-insensitive conduit - containers deepseq directory filepath haskell-src-exts http-types - parsec process QuickCheck random resourcet safe text transformers - uniplate unix vector vector-algorithms wai - ]; - executableHaskellDepends = [ - aeson array base binary blaze-builder bytestring Cabal - case-insensitive cmdargs conduit containers deepseq directory - filepath haskell-src-exts http-types old-locale parsec process - QuickCheck random resourcet safe shake tagsoup text time - transformers uniplate unix vector vector-algorithms wai warp - ]; - testHaskellDepends = [ base directory filepath process temporary ]; - testTarget = "--test-option=--no-net"; - homepage = "http://www.haskell.org/hoogle/"; - description = "Haskell API Search"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hoogle" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra @@ -110195,8 +110237,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.0"; - sha256 = "31b20c903a6662eb2bbcf9aa2998936bc216e0711587134325bbe12fb615efd2"; + version = "1.4.1"; + sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe text transformers uniplate unix-bytestring unordered-containers uuid vector @@ -113445,8 +113487,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1.0.1"; - sha256 = "c0f92db8b4c0bdc2d188c1f17833fb684489ab3147837e68bffa96375c7fa89a"; + version = "0.1.0.2"; + sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -115478,8 +115520,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "mathexpr"; - version = "0.1.0.0"; - sha256 = "f2f20f96c3674e65be8c34d409addca4363d5921391e01ca77c3266261aeb197"; + version = "0.3.0.0"; + sha256 = "23c30ae0c962a7858d57bed320be6421baeb82fa795260e1eea0bc8fcc4871ad"; libraryHaskellDepends = [ base data-default-class ]; homepage = "https://github.com/mdibaiee/mathexpr"; description = "Parse and evaluate math expressions with variables and functions"; @@ -124397,8 +124439,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.3.0"; - sha256 = "c6b7d05e5546ad7b18ab642e183fc4f7841d17cd501205606e423fa3ec908afe"; + version = "0.2.3.1"; + sha256 = "2c5b5a6199e6eb4e11fc25cf92663bfaed323f44d34f05991ede25429e8b322c"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -124956,6 +124998,8 @@ self: { pname = "normalization-insensitive"; version = "2.0"; sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29"; + revision = "1"; + editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -125242,8 +125286,8 @@ self: { }: mkDerivation { pname = "ntrip-client"; - version = "0.1.3"; - sha256 = "a3884c256f886658069d7d39fe5eef3c22078b10bb104913796b2a10ea6cbeb1"; + version = "0.1.4"; + sha256 = "e1c1dda1e00e2b195d0c326ccf0bc23f122c4337d68056a6fc66646ee05aec2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132247,8 +132291,8 @@ self: { ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }: mkDerivation { pname = "picedit"; - version = "0.1.1.0"; - sha256 = "4219089f3375925f413111d05ce9087b1f4aca01f43d64ddd3fc2931c52d7740"; + version = "0.1.1.1"; + sha256 = "29cb93ae27ac980884f4a8db3896ae8e7d2b2bcf1b77d368a9ff9a3fb9a7bfcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; @@ -137975,12 +138019,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161031" = callPackage + "publicsuffix_0_20161104" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161031"; - sha256 = "a8e9a7de8e5a0d099520dd5887384d4b87b1659db0e7a4802622112f416601f3"; + version = "0.20161104"; + sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -140881,8 +140925,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "0.1.4"; - sha256 = "c4db03c11f2ebaacde6d6a0c72da6450556cf703c549620ecaa11fb78eabbe24"; + version = "0.1.6"; + sha256 = "a1578ce6b94f5b2ad92eb2873fab947918a466f4c34e5a1e659ac15fe18a733d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149521,13 +149565,13 @@ self: { }) {}; "semiring-num" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck, random }: + ({ mkDerivation, base, containers, doctest, smallcheck }: mkDerivation { pname = "semiring-num"; - version = "0.1.0.6"; - sha256 = "8c14936ff6c32e52af02b0e8a40bb46026db3fb3b096e94268bb93342a9f6608"; - libraryHaskellDepends = [ base containers QuickCheck random ]; - testHaskellDepends = [ base containers doctest QuickCheck ]; + version = "0.3.0.0"; + sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest smallcheck ]; homepage = "https://github.com/oisdk/semiring-num"; description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; @@ -150006,6 +150050,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "serokell-util" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-extra, base + , base16-bytestring, base64-bytestring, binary, binary-orphans + , bytestring, cereal, cereal-vector, clock, containers + , data-msgpack, deepseq, directory, either, exceptions, extra + , filepath, formatting, hashable, hspec, lens, mtl + , optparse-applicative, parsec, QuickCheck, quickcheck-instances + , safecopy, scientific, semigroups, template-haskell, text + , text-format, time-units, transformers, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "serokell-util"; + version = "0.1.1.1"; + sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; + libraryHaskellDepends = [ + acid-state aeson aeson-extra base base16-bytestring + base64-bytestring binary binary-orphans bytestring cereal + cereal-vector clock containers data-msgpack deepseq directory + either exceptions extra filepath formatting hashable lens mtl + optparse-applicative parsec QuickCheck quickcheck-instances + safecopy scientific semigroups template-haskell text text-format + time-units transformers unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal data-msgpack hspec QuickCheck + quickcheck-instances safecopy scientific text text-format + unordered-containers vector + ]; + homepage = "https://github.com/serokell/serokell-util"; + description = "General-purpose functions by Serokell"; + license = stdenv.lib.licenses.mit; + }) {}; + "serpentine" = callPackage ({ mkDerivation, base, pringletons, singletons, template-haskell , text, vinyl @@ -158539,6 +158617,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_0_1_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, exceptions, file-embed, filepath, hspec + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "0.1.8"; + sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory exceptions + filepath megaparsec mtl template-haskell text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec text yaml + ]; + homepage = "https://github.com/stackbuilders/stache"; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async , attoparsec, base, base-compat, base16-bytestring @@ -159909,8 +160012,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-split"; - version = "0.0.0.2"; - sha256 = "020786bd45793192010050d18bbb12b30c22cf6b544015c4199dce20def0167e"; + version = "0.0.1"; + sha256 = "001c3ceeb61498b11791225c4985cf6a9fa7e218a9b0631d54b57cc4837421b9"; libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -163547,8 +163650,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "tagged-identity"; - version = "0.1.0"; - sha256 = "ba4051456f2d594d128698e052291556608e4c9a57e95ede1962cbc932d82800"; + version = "0.1.1"; + sha256 = "dcf0676dca1422165d48795ab1e4a512a6fd678aef685c85c00b5fcaba001aa8"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/mrkkrp/tagged-identity"; description = "Trivial monad transformer that allows identical monad stacks have different types"; @@ -164076,6 +164179,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tar-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit-combinators }: + mkDerivation { + pname = "tar-conduit"; + version = "0.1.0"; + sha256 = "64cd8ea8d072b3a43e539e3c8d1f9e0936430ad9f9ff3a54d1e237c077878e2f"; + libraryHaskellDepends = [ base bytestring conduit-combinators ]; + homepage = "https://github.com/snoyberg/tar-conduit#readme"; + description = "Parse tar files using conduit for streaming"; + license = stdenv.lib.licenses.mit; + }) {}; + "tardis" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { @@ -164245,6 +164360,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "tasty-discover"; + version = "1.0.0"; + sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-th + ]; + executableHaskellDepends = [ base directory filepath tasty-th ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/lwm/tasty-discover/"; + description = "Automatically discover and run Tasty framework tests"; + license = "GPL"; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { From 6a76ee237d9fb7255a4cef53bbb0d60258626293 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2016 21:24:59 +0100 Subject: [PATCH 228/336] haskell-hoogle doesn't work with haskell-src-exts-1.19.x. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b190340641b..6849fa03908 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -983,7 +983,7 @@ self: super: { }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_0; }; + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; From 5eddbc10c9abce952d1a87e01390c724039adb93 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Nov 2016 16:43:42 +0300 Subject: [PATCH 229/336] zeroad: refactor, split data from binaries --- pkgs/games/0ad/data.nix | 19 +++-- pkgs/games/0ad/default.nix | 131 ++----------------------------- pkgs/games/0ad/game.nix | 96 ++++++++++++++++++++++ pkgs/games/0ad/rootdir_env.patch | 38 +++++++++ pkgs/games/0ad/wrapper.nix | 21 +++++ pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 177 insertions(+), 132 deletions(-) create mode 100644 pkgs/games/0ad/game.nix create mode 100644 pkgs/games/0ad/rootdir_env.patch create mode 100644 pkgs/games/0ad/wrapper.nix diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index aea36d211aa..98603251e59 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, version, releaseType }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "0ad-data-${version}"; + version = "0.0.20"; src = fetchurl { - url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; + url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv"; }; - patchPhase = '' + installPhase = '' rm binaries/data/tools/fontbuilder/fonts/*.txt + mkdir -p $out/share/0ad + cp -r binaries/data $out/share/0ad/ ''; - installPhase = '' - mkdir -p $out/share/0ad - cp -r binaries/data/* $out/share/0ad/ - ''; + meta = with stdenv.lib; { + description = "A free, open-source game of ancient warfare -- data files"; + homepage = "http://wildfiregames.com/0ad/"; + license = licenses.cc-by-sa-30; + platforms = platforms.linux; + }; } diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 0a2c342e8ed..983e8accc20 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,131 +1,14 @@ -{ stdenv, callPackage, fetchurl, python27 -, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng -, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 -, gloox, nvidia-texture-tools -, withEditor ? true, wxGTK ? null -}: - -assert withEditor -> wxGTK != null; +{ newScope }: let - version = "0.0.20"; + callPackage = newScope self; - releaseType = "alpha"; + self = { + zeroad-unwrapped = callPackage ./game.nix { }; - zeroadData = callPackage ./data.nix { inherit version releaseType; }; + zeroad-data = callPackage ./data.nix { }; - archForPremake = - if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else - if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR"; - -in -stdenv.mkDerivation rec { - name = "0ad-${version}"; - - src = fetchurl { - url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; - sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + zeroad = callPackage ./wrapper.nix { }; }; - buildInputs = [ - zeroadData python27 pkgconfig spidermonkey_31 boost icu - libxml2 libpng libjpeg zlib curl libogg libvorbis enet - miniupnpc openal mesa xproto libX11 libXcursor nspr - SDL SDL2 gloox nvidia-texture-tools - ] ++ stdenv.lib.optional withEditor wxGTK; - - NIX_CFLAGS_COMPILE = [ - "-I${xproto}/include/X11" - "-I${libX11.dev}/include/X11" - "-I${libXcursor.dev}/include/X11" - "-I${SDL.dev}/include/SDL" - "-I${SDL2}/include/SDL2" - ]; - - patchPhase = '' - sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h - ''; - - configurePhase = '' - # Delete shipped libraries which we don't need. - rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - - # Build shipped premake. - make -C build/premake/premake4/build/gmake.unix - - # Run premake. - pushd build/premake - ./premake4/bin/release/premake4 \ - --file="premake4.lua" \ - --outpath="../workspaces/gcc/" \ - --platform=${archForPremake} \ - --os=linux \ - --with-system-nvtt \ - --with-system-enet \ - --with-system-miniupnpc \ - --with-system-mozjs31 \ - ${ if withEditor then "--atlas" else "" } \ - --collada \ - --bindir="$out"/bin \ - --libdir="$out"/lib/0ad \ - --datadir="$out"/share/0ad \ - --without-tests \ - gmake - popd - ''; - - buildPhase = '' - # Build bundled fcollada. - make -C libraries/source/fcollada/src - - # Build 0ad. - make -C build/workspaces/gcc verbose=1 - ''; - - installPhase = '' - # Copy executables. - mkdir -p "$out"/bin - cp binaries/system/pyrogenesis "$out"/bin/0ad - ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/ - - # Copy l10n data. - mkdir -p "$out"/share/0ad - cp -r binaries/data/l10n "$out"/share/0ad/ - - # Copy libraries. - mkdir -p "$out"/lib/0ad - cp binaries/system/libCollada.so "$out"/lib/0ad/ - ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/ - - # Create links to data files. - ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/* - - # Copy icon. - mkdir -p "$out"/share/icons - cp build/resources/0ad.png "$out"/share/icons/ - - # Copy/fix desktop item. - mkdir -p "$out"/share/applications - while read LINE; do - if [[ $LINE = "Exec=0ad" ]]; then - echo "Exec=$out/bin/zeroad" - elif [[ $LINE = "Icon=0ad" ]]; then - echo "Icon=$out/share/icons/0ad.png" - else - echo "$LINE" - fi - done "$out"/share/applications/0ad.desktop - ''; - - meta = with stdenv.lib; { - description = "A free, open-source game of ancient warfare"; - homepage = "http://wildfiregames.com/0ad/"; - license = with licenses; [ - gpl2 lgpl21 mit cc-by-sa-30 - licenses.zlib # otherwise masked by pkgs.zlib - ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - hydraPlatforms = []; # the data are too big (~1.5 GB) - }; -} +in self diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix new file mode 100644 index 00000000000..e4d4e3cb8e4 --- /dev/null +++ b/pkgs/games/0ad/game.nix @@ -0,0 +1,96 @@ +{ stdenv, lib, callPackage, perl, fetchurl, python2 +, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng +, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc +, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, gloox, nvidia-texture-tools +, withEditor ? true, wxGTK ? null +}: + +assert withEditor -> wxGTK != null; + +stdenv.mkDerivation rec { + name = "0ad-${version}"; + version = "0.0.20"; + + src = fetchurl { + url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; + sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + }; + + nativeBuildInputs = [ python2 perl pkgconfig ]; + + buildInputs = [ + spidermonkey_31 boost icu libxml2 libpng libjpeg + zlib curl libogg libvorbis enet miniupnpc openal + mesa xproto libX11 libXcursor nspr SDL2 gloox + nvidia-texture-tools + ] ++ lib.optional withEditor wxGTK; + + NIX_CFLAGS_COMPILE = [ + "-I${xproto}/include/X11" + "-I${libX11.dev}/include/X11" + "-I${libXcursor.dev}/include/X11" + "-I${SDL.dev}/include/SDL" + "-I${SDL2}/include/SDL2" + ]; + + patches = [ ./rootdir_env.patch ]; + + postPatch = '' + sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h + ''; + + configurePhase = '' + # Delete shipped libraries which we don't need. + rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + + # Update Makefiles + pushd build/workspaces + ./update-workspaces.sh \ + --with-system-nvtt \ + --with-system-mozjs31 \ + ${lib.optionalString withEditor "--enable-atlas"} \ + --bindir="$out"/bin \ + --libdir="$out"/lib/0ad \ + --without-tests \ + -j $NIX_BUILD_CORES + popd + + # Move to the build directory. + pushd build/workspaces/gcc + ''; + + enableParallelBuilding = true; + + installPhase = '' + popd + + # Copy executables. + install -Dm755 binaries/system/pyrogenesis "$out"/bin/0ad + ${lib.optionalString withEditor '' + install -Dm755 binaries/system/ActorEditor "$out"/bin/ActorEditor + ''} + + # Copy l10n data. + mkdir -p "$out"/share/0ad/data + cp -r binaries/data/l10n "$out"/share/0ad/data + + # Copy libraries. + mkdir -p "$out"/lib/0ad + cp binaries/system/*.so "$out"/lib/0ad/ + + # Copy icon. + install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png + install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop + ''; + + meta = with stdenv.lib; { + description = "A free, open-source game of ancient warfare"; + homepage = "http://wildfiregames.com/0ad/"; + license = with licenses; [ + gpl2 lgpl21 mit cc-by-sa-30 + licenses.zlib # otherwise masked by pkgs.zlib + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch new file mode 100644 index 00000000000..c001473e510 --- /dev/null +++ b/pkgs/games/0ad/rootdir_env.patch @@ -0,0 +1,38 @@ +diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp +--- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300 ++++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300 +@@ -155,32 +155,8 @@ + + /*static*/ OsPath Paths::Root(const OsPath& argv0) + { +-#if OS_ANDROID +- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus +-#else +- +- // get full path to executable +- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation +- if(pathname.empty()) // failed, use argv[0] instead +- { +- errno = 0; +- pathname = wrealpath(argv0); +- if(pathname.empty()) +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- // make sure it's valid +- if(!FileExists(pathname)) +- { +- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" +- pathname = pathname.Parent(); +- return pathname; +- +-#endif ++ UNUSED2(argv0); ++ return getenv("ZEROAD_ROOTDIR"); + } + + /*static*/ OsPath Paths::RootData(const OsPath& argv0) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix new file mode 100644 index 00000000000..ca7c8e16e3c --- /dev/null +++ b/pkgs/games/0ad/wrapper.nix @@ -0,0 +1,21 @@ +{ buildEnv, makeWrapper, zeroad-unwrapped, zeroad-data }: + +assert zeroad-unwrapped.version == zeroad-data.version; + +buildEnv { + name = "zeroad-${zeroad-unwrapped.version}"; + inherit (zeroad-unwrapped) meta; + + buildInputs = [ makeWrapper ]; + + paths = [ zeroad-unwrapped zeroad-data ]; + + pathsToLink = [ "/" "/bin" ]; + + postBuild = '' + for i in $out/bin/*; do + wrapProgram "$i" \ + --set ZEROAD_ROOTDIR "$out/share/0ad" + done + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a4abe60d3..8b6be885ee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16003,7 +16003,9 @@ in keen4 = callPackage ../games/keen4 { }; - zeroad = callPackage ../games/0ad { }; + zeroadPackages = callPackage ../games/0ad { }; + + zeroad = zeroadPackages.zeroad; ### DESKTOP ENVIRONMENTS From bd0ffa50aa99822b100c7a3b662a4edce086bded Mon Sep 17 00:00:00 2001 From: Me Date: Fri, 4 Nov 2016 14:09:09 -0800 Subject: [PATCH 230/336] qt56.qtwebengine: chromium clang update.py patch Add patch to the clang update.py script for chromium that makes it work the same as in qt57.qtwebengine. This avoids issues with the subprocess.call that is used to run update.sh not liking the path it is passed in certain build enviroments. update.sh is no longer used. --- .../libraries/qt-5/5.6/default.nix | 2 +- .../chromium-clang-update-py.patch | 874 ++++++++++++++++++ .../default.nix} | 3 + 3 files changed, 878 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch rename pkgs/development/libraries/qt-5/5.6/{qtwebengine.nix => qtwebengine/default.nix} (96%) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 2112b29c729..0e40a7ac96d 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -94,7 +94,7 @@ let qttranslations = callPackage ./qttranslations.nix {}; qtwayland = callPackage ./qtwayland.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {}; - qtwebengine = callPackage ./qtwebengine.nix {}; + qtwebengine = callPackage ./qtwebengine {}; qtwebkit = callPackage ./qtwebkit {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch new file mode 100644 index 00000000000..65a604d2534 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch @@ -0,0 +1,874 @@ +--- a/src/3rdparty/chromium/tools/clang/scripts/update.py 2016-05-26 04:58:54.000000000 -0800 ++++ b/src/3rdparty/chromium/tools/clang/scripts/update.py 2016-11-04 08:35:34.956154012 -0800 +@@ -3,12 +3,12 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-"""Windows can't run .sh files, so this is a Python implementation of +-update.sh. This script should replace update.sh on all platforms eventually.""" ++"""This script is used to download prebuilt clang binaries. ++ ++It is also used by package.py to build the prebuilt clang binaries.""" + + import argparse +-import contextlib +-import cStringIO ++import distutils.spawn + import glob + import os + import pipes +@@ -18,6 +18,7 @@ + import stat + import sys + import tarfile ++import tempfile + import time + import urllib2 + import zipfile +@@ -25,19 +26,16 @@ + # Do NOT CHANGE this if you don't know what you're doing -- see + # https://code.google.com/p/chromium/wiki/UpdatingClang + # Reverting problematic clang rolls is safe, though. +-# Note: this revision is only used for Windows. Other platforms use update.sh. +-# TODO(thakis): Use the same revision on Windows and non-Windows. +-# TODO(thakis): Remove update.sh, use update.py everywhere. +-LLVM_WIN_REVISION = '239674' ++CLANG_REVISION = '239674' + + use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ + if use_head_revision: +- LLVM_WIN_REVISION = 'HEAD' ++ CLANG_REVISION = 'HEAD' + + # This is incremented when pushing a new build of Clang at the same revision. + CLANG_SUB_REVISION=1 + +-PACKAGE_VERSION = "%s-%s" % (LLVM_WIN_REVISION, CLANG_SUB_REVISION) ++PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION) + + # Path constants. (All of these should be absolute paths.) + THIS_DIR = os.path.abspath(os.path.dirname(__file__)) +@@ -50,17 +48,26 @@ + CHROME_TOOLS_SHIM_DIR = os.path.join(LLVM_DIR, 'tools', 'chrometools') + LLVM_BUILD_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'llvm-build', + 'Release+Asserts') +-COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, '32bit-compiler-rt') ++COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, 'compiler-rt') + CLANG_DIR = os.path.join(LLVM_DIR, 'tools', 'clang') + LLD_DIR = os.path.join(LLVM_DIR, 'tools', 'lld') +-COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt') ++# compiler-rt is built as part of the regular LLVM build on Windows to get ++# the 64-bit runtime, and out-of-tree elsewhere. ++# TODO(thakis): Try to unify this. ++if sys.platform == 'win32': ++ COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt') ++else: ++ COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'compiler-rt') + LIBCXX_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxx') + LIBCXXABI_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxxabi') + LLVM_BUILD_TOOLS_DIR = os.path.abspath( + os.path.join(LLVM_DIR, '..', 'llvm-build-tools')) +-STAMP_FILE = os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision') ++STAMP_FILE = os.path.normpath( ++ os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision')) + BINUTILS_DIR = os.path.join(THIRD_PARTY_DIR, 'binutils') +-VERSION = '3.7.0' ++VERSION = '3.8.0' ++ANDROID_NDK_DIR = os.path.join( ++ CHROMIUM_DIR, 'third_party', 'android_tools', 'ndk') + + # URL for pre-built binaries. + CDS_URL = 'https://commondatastorage.googleapis.com/chromium-browser-clang' +@@ -74,40 +81,75 @@ + """Download url into output_file.""" + CHUNK_SIZE = 4096 + TOTAL_DOTS = 10 +- sys.stdout.write('Downloading %s ' % url) +- sys.stdout.flush() +- response = urllib2.urlopen(url) +- total_size = int(response.info().getheader('Content-Length').strip()) +- bytes_done = 0 +- dots_printed = 0 ++ num_retries = 3 ++ retry_wait_s = 5 # Doubled at each retry. ++ + while True: +- chunk = response.read(CHUNK_SIZE) +- if not chunk: +- break +- output_file.write(chunk) +- bytes_done += len(chunk) +- num_dots = TOTAL_DOTS * bytes_done / total_size +- sys.stdout.write('.' * (num_dots - dots_printed)) +- sys.stdout.flush() +- dots_printed = num_dots +- print ' Done.' ++ try: ++ sys.stdout.write('Downloading %s ' % url) ++ sys.stdout.flush() ++ response = urllib2.urlopen(url) ++ total_size = int(response.info().getheader('Content-Length').strip()) ++ bytes_done = 0 ++ dots_printed = 0 ++ while True: ++ chunk = response.read(CHUNK_SIZE) ++ if not chunk: ++ break ++ output_file.write(chunk) ++ bytes_done += len(chunk) ++ num_dots = TOTAL_DOTS * bytes_done / total_size ++ sys.stdout.write('.' * (num_dots - dots_printed)) ++ sys.stdout.flush() ++ dots_printed = num_dots ++ if bytes_done != total_size: ++ raise urllib2.URLError("only got %d of %d bytes" % ++ (bytes_done, total_size)) ++ print ' Done.' ++ return ++ except urllib2.URLError as e: ++ sys.stdout.write('\n') ++ print e ++ if num_retries == 0 or isinstance(e, urllib2.HTTPError) and e.code == 404: ++ raise e ++ num_retries -= 1 ++ print 'Retrying in %d s ...' % retry_wait_s ++ time.sleep(retry_wait_s) ++ retry_wait_s *= 2 ++ ++ ++def EnsureDirExists(path): ++ if not os.path.exists(path): ++ print "Creating directory %s" % path ++ os.makedirs(path) ++ ++ ++def DownloadAndUnpack(url, output_dir): ++ with tempfile.TemporaryFile() as f: ++ DownloadUrl(url, f) ++ f.seek(0) ++ EnsureDirExists(output_dir) ++ if url.endswith('.zip'): ++ zipfile.ZipFile(f).extractall(path=output_dir) ++ else: ++ tarfile.open(mode='r:gz', fileobj=f).extractall(path=output_dir) + + + def ReadStampFile(): + """Return the contents of the stamp file, or '' if it doesn't exist.""" + try: + with open(STAMP_FILE, 'r') as f: +- return f.read() ++ return f.read().rstrip() + except IOError: + return '' + + + def WriteStampFile(s): + """Write s to the stamp file.""" +- if not os.path.exists(os.path.dirname(STAMP_FILE)): +- os.makedirs(os.path.dirname(STAMP_FILE)) ++ EnsureDirExists(os.path.dirname(STAMP_FILE)) + with open(STAMP_FILE, 'w') as f: + f.write(s) ++ f.write('\n') + + + def GetSvnRevision(svn_repo): +@@ -129,6 +171,13 @@ + shutil.rmtree(dir, onerror=ChmodAndRetry) + + ++def RmCmakeCache(dir): ++ """Delete CMakeCache.txt files under dir recursively.""" ++ for dirpath, _, files in os.walk(dir): ++ if 'CMakeCache.txt' in files: ++ os.remove(os.path.join(dirpath, 'CMakeCache.txt')) ++ ++ + def RunCommand(command, msvc_arch=None, env=None, fail_hard=True): + """Run command and return success (True) or failure; or if fail_hard is + True, exit on failure. If msvc_arch is set, runs the command in a +@@ -170,8 +219,8 @@ + def CopyDirectoryContents(src, dst, filename_filter=None): + """Copy the files from directory src to dst + with an optional filename filter.""" +- if not os.path.exists(dst): +- os.makedirs(dst) ++ dst = os.path.realpath(dst) # realpath() in case dst ends in /.. ++ EnsureDirExists(dst) + for root, _, files in os.walk(src): + for f in files: + if filename_filter and not re.match(filename_filter, f): +@@ -181,9 +230,9 @@ + + def Checkout(name, url, dir): + """Checkout the SVN module at url into dir. Use name for the log message.""" +- print "Checking out %s r%s into '%s'" % (name, LLVM_WIN_REVISION, dir) ++ print "Checking out %s r%s into '%s'" % (name, CLANG_REVISION, dir) + +- command = ['svn', 'checkout', '--force', url + '@' + LLVM_WIN_REVISION, dir] ++ command = ['svn', 'checkout', '--force', url + '@' + CLANG_REVISION, dir] + if RunCommand(command, fail_hard=False): + return + +@@ -195,120 +244,9 @@ + RunCommand(command) + + +-def RevertPreviouslyPatchedFiles(): +- print 'Reverting previously patched files' +- files = [ +- '%(clang)s/test/Index/crash-recovery-modules.m', +- '%(clang)s/unittests/libclang/LibclangTest.cpp', +- '%(compiler_rt)s/lib/asan/asan_rtl.cc', +- '%(compiler_rt)s/test/asan/TestCases/Linux/new_array_cookie_test.cc', +- '%(llvm)s/test/DebugInfo/gmlt.ll', +- '%(llvm)s/lib/CodeGen/SpillPlacement.cpp', +- '%(llvm)s/lib/CodeGen/SpillPlacement.h', +- '%(llvm)s/lib/Transforms/Instrumentation/MemorySanitizer.cpp', +- '%(clang)s/test/Driver/env.c', +- '%(clang)s/lib/Frontend/InitPreprocessor.cpp', +- '%(clang)s/test/Frontend/exceptions.c', +- '%(clang)s/test/Preprocessor/predefined-exceptions.m', +- '%(llvm)s/test/Bindings/Go/go.test', +- '%(clang)s/lib/Parse/ParseExpr.cpp', +- '%(clang)s/lib/Parse/ParseTemplate.cpp', +- '%(clang)s/lib/Sema/SemaDeclCXX.cpp', +- '%(clang)s/lib/Sema/SemaExprCXX.cpp', +- '%(clang)s/test/SemaCXX/default2.cpp', +- '%(clang)s/test/SemaCXX/typo-correction-delayed.cpp', +- '%(compiler_rt)s/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc', +- '%(compiler_rt)s/test/tsan/signal_segv_handler.cc', +- '%(compiler_rt)s/lib/sanitizer_common/sanitizer_coverage_libcdep.cc', +- '%(compiler_rt)s/cmake/config-ix.cmake', +- '%(compiler_rt)s/CMakeLists.txt', +- '%(compiler_rt)s/lib/ubsan/ubsan_platform.h', +- ] +- for f in files: +- f = f % { +- 'clang': CLANG_DIR, +- 'compiler_rt': COMPILER_RT_DIR, +- 'llvm': LLVM_DIR, +- } +- if os.path.exists(f): +- os.remove(f) # For unversioned files. +- RunCommand(['svn', 'revert', f]) +- +- +-def ApplyLocalPatches(): +- # There's no patch program on Windows by default. We don't need patches on +- # Windows yet, and maybe this not working on Windows will motivate us to +- # remove patches over time. +- assert sys.platform != 'win32' +- +- # Apply patch for tests failing with --disable-pthreads (llvm.org/PR11974) +- clang_patches = [ r"""\ +---- test/Index/crash-recovery-modules.m (revision 202554) +-+++ test/Index/crash-recovery-modules.m (working copy) +-@@ -12,6 +12,8 @@ +- +- // REQUIRES: crash-recovery +- // REQUIRES: shell +-+// XFAIL: * +-+// (PR11974) +- +- @import Crash; +-""", r"""\ +---- unittests/libclang/LibclangTest.cpp (revision 215949) +-+++ unittests/libclang/LibclangTest.cpp (working copy) +-@@ -431,7 +431,7 @@ +- EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU)); +- } +- +--TEST_F(LibclangReparseTest, ReparseWithModule) { +-+TEST_F(LibclangReparseTest, DISABLED_ReparseWithModule) { +- const char *HeaderTop = "#ifndef H\n#define H\nstruct Foo { int bar;"; +- const char *HeaderBottom = "\n};\n#endif\n"; +- const char *MFile = "#include \"HeaderFile.h\"\nint main() {" +-""" +- ] +- +- # This Go bindings test doesn't work after bootstrap on Linux, PR21552. +- llvm_patches = [ r"""\ +---- test/Bindings/Go/go.test (revision 223109) +-+++ test/Bindings/Go/go.test (working copy) +-@@ -1,3 +1,3 @@ +--; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm +-+; RUN: true +- +- ; REQUIRES: shell +-""" +- ] +- +- # The UBSan run-time, which is now bundled with the ASan run-time, doesn't +- # work on Mac OS X 10.8 (PR23539). +- compiler_rt_patches = [ r"""\ +---- CMakeLists.txt (revision 241602) +-+++ CMakeLists.txt (working copy) +-@@ -305,6 +305,7 @@ +- list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim) +- endif() +- endif() +-+ set(SANITIZER_MIN_OSX_VERSION "10.7") +- if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7") +- message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}") +- endif() +-""" +- ] +- +- for path, patches in [(LLVM_DIR, llvm_patches), +- (CLANG_DIR, clang_patches), +- (COMPILER_RT_DIR, compiler_rt_patches)]: +- print 'Applying patches in', path +- for patch in patches: +- print patch +- p = subprocess.Popen( ['patch', '-p0', '-d', path], stdin=subprocess.PIPE) +- (stdout, stderr) = p.communicate(input=patch) +- if p.returncode != 0: +- raise RuntimeError('stdout %s, stderr %s' % (stdout, stderr)) +- +- + def DeleteChromeToolsShim(): ++ OLD_SHIM_DIR = os.path.join(LLVM_DIR, 'tools', 'zzz-chrometools') ++ shutil.rmtree(OLD_SHIM_DIR, ignore_errors=True) + shutil.rmtree(CHROME_TOOLS_SHIM_DIR, ignore_errors=True) + + +@@ -337,6 +275,25 @@ + f.write('endif (CHROMIUM_TOOLS_SRC)\n') + + ++def MaybeDownloadHostGcc(args): ++ """Downloads gcc 4.8.2 if needed and makes sure args.gcc_toolchain is set.""" ++ if not sys.platform.startswith('linux') or args.gcc_toolchain: ++ return ++ ++ if subprocess.check_output(['gcc', '-dumpversion']).rstrip() < '4.7.0': ++ # We need a newer gcc version. ++ gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc482precise') ++ if not os.path.exists(gcc_dir): ++ print 'Downloading pre-built GCC 4.8.2...' ++ DownloadAndUnpack( ++ CDS_URL + '/tools/gcc482precise.tgz', LLVM_BUILD_TOOLS_DIR) ++ args.gcc_toolchain = gcc_dir ++ else: ++ # Always set gcc_toolchain; llvm-symbolizer needs the bundled libstdc++. ++ args.gcc_toolchain = \ ++ os.path.dirname(os.path.dirname(distutils.spawn.find_executable('gcc'))) ++ ++ + def AddCMakeToPath(): + """Download CMake and add it to PATH.""" + if sys.platform == 'win32': +@@ -345,20 +302,10 @@ + 'cmake-3.2.2-win32-x86', 'bin') + else: + suffix = 'Darwin' if sys.platform == 'darwin' else 'Linux' +- zip_name = 'cmake310_%s.tgz' % suffix +- cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'cmake310', 'bin') ++ zip_name = 'cmake322_%s.tgz' % suffix ++ cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'cmake322', 'bin') + if not os.path.exists(cmake_dir): +- if not os.path.exists(LLVM_BUILD_TOOLS_DIR): +- os.makedirs(LLVM_BUILD_TOOLS_DIR) +- # The cmake archive is smaller than 20 MB, small enough to keep in memory: +- with contextlib.closing(cStringIO.StringIO()) as f: +- DownloadUrl(CDS_URL + '/tools/' + zip_name, f) +- f.seek(0) +- if zip_name.endswith('.zip'): +- zipfile.ZipFile(f).extractall(path=LLVM_BUILD_TOOLS_DIR) +- else: +- tarfile.open(mode='r:gz', fileobj=f).extractall(path= +- LLVM_BUILD_TOOLS_DIR) ++ DownloadAndUnpack(CDS_URL + '/tools/' + zip_name, LLVM_BUILD_TOOLS_DIR) + os.environ['PATH'] = cmake_dir + os.pathsep + os.environ.get('PATH', '') + + vs_version = None +@@ -383,37 +330,61 @@ + + def UpdateClang(args): + print 'Updating Clang to %s...' % PACKAGE_VERSION +- if ReadStampFile() == PACKAGE_VERSION: +- print 'Already up to date.' +- return 0 ++ ++ need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or ( ++ sys.platform.startswith('linux') and ++ 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and ++ 'branding=Chrome' in os.environ.get('GYP_DEFINES', '')) ++ ++ if ReadStampFile() == PACKAGE_VERSION and not args.force_local_build: ++ print 'Clang is already up to date.' ++ if not need_gold_plugin or os.path.exists( ++ os.path.join(LLVM_BUILD_DIR, "lib/LLVMgold.so")): ++ return 0 + + # Reset the stamp file in case the build is unsuccessful. + WriteStampFile('') + + if not args.force_local_build: + cds_file = "clang-%s.tgz" % PACKAGE_VERSION +- cds_full_url = CDS_URL + '/Win/' + cds_file ++ if sys.platform == 'win32': ++ cds_full_url = CDS_URL + '/Win/' + cds_file ++ elif sys.platform == 'darwin': ++ cds_full_url = CDS_URL + '/Mac/' + cds_file ++ else: ++ assert sys.platform.startswith('linux') ++ cds_full_url = CDS_URL + '/Linux_x64/' + cds_file + +- # Check if there's a prebuilt binary and if so just fetch that. That's +- # faster, and goma relies on having matching binary hashes on client and +- # server too. +- print 'Trying to download prebuilt clang' +- +- # clang packages are smaller than 50 MB, small enough to keep in memory. +- with contextlib.closing(cStringIO.StringIO()) as f: +- try: +- DownloadUrl(cds_full_url, f) +- f.seek(0) +- tarfile.open(mode='r:gz', fileobj=f).extractall(path=LLVM_BUILD_DIR) +- print 'clang %s unpacked' % PACKAGE_VERSION +- WriteStampFile(PACKAGE_VERSION) +- return 0 +- except urllib2.HTTPError: +- print 'Did not find prebuilt clang %s, building locally' % cds_file ++ print 'Downloading prebuilt clang' ++ if os.path.exists(LLVM_BUILD_DIR): ++ RmTree(LLVM_BUILD_DIR) ++ try: ++ DownloadAndUnpack(cds_full_url, LLVM_BUILD_DIR) ++ print 'clang %s unpacked' % PACKAGE_VERSION ++ # Download the gold plugin if requested to by an environment variable. ++ # This is used by the CFI ClusterFuzz bot, and it's required for official ++ # builds on linux. ++ if need_gold_plugin: ++ RunCommand(['python', CHROMIUM_DIR+'/build/download_gold_plugin.py']) ++ WriteStampFile(PACKAGE_VERSION) ++ return 0 ++ except urllib2.URLError: ++ print 'Failed to download prebuilt clang %s' % cds_file ++ print 'Use --force-local-build if you want to build locally.' ++ print 'Exiting.' ++ return 1 ++ ++ if args.with_android and not os.path.exists(ANDROID_NDK_DIR): ++ print 'Android NDK not found at ' + ANDROID_NDK_DIR ++ print 'The Android NDK is needed to build a Clang whose -fsanitize=address' ++ print 'works on Android. See ' ++ print 'http://code.google.com/p/chromium/wiki/AndroidBuildInstructions' ++ print 'for how to install the NDK, or pass --without-android.' ++ return 1 + ++ MaybeDownloadHostGcc(args) + AddCMakeToPath() + +- RevertPreviouslyPatchedFiles() + DeleteChromeToolsShim() + + Checkout('LLVM', LLVM_REPO_URL + '/llvm/trunk', LLVM_DIR) +@@ -429,10 +400,24 @@ + # into it too (since OS X 10.6 doesn't have libc++abi.dylib either). + Checkout('libcxxabi', LLVM_REPO_URL + '/libcxxabi/trunk', LIBCXXABI_DIR) + +- if args.with_patches and sys.platform != 'win32': +- ApplyLocalPatches() +- + cc, cxx = None, None ++ libstdcpp = None ++ if args.gcc_toolchain: # This option is only used on Linux. ++ # Use the specified gcc installation for building. ++ cc = os.path.join(args.gcc_toolchain, 'bin', 'gcc') ++ cxx = os.path.join(args.gcc_toolchain, 'bin', 'g++') ++ ++ if not os.access(cc, os.X_OK): ++ print 'Invalid --gcc-toolchain: "%s"' % args.gcc_toolchain ++ print '"%s" does not appear to be valid.' % cc ++ return 1 ++ ++ # Set LD_LIBRARY_PATH to make auxiliary targets (tablegen, bootstrap ++ # compiler, etc.) find the .so. ++ libstdcpp = subprocess.check_output( ++ [cxx, '-print-file-name=libstdc++.so.6']).rstrip() ++ os.environ['LD_LIBRARY_PATH'] = os.path.dirname(libstdcpp) ++ + cflags = cxxflags = ldflags = [] + + # LLVM uses C++11 starting in llvm 3.5. On Linux, this means libstdc++4.7+ is +@@ -462,8 +447,7 @@ + + if args.bootstrap: + print 'Building bootstrap compiler' +- if not os.path.exists(LLVM_BOOTSTRAP_DIR): +- os.makedirs(LLVM_BOOTSTRAP_DIR) ++ EnsureDirExists(LLVM_BOOTSTRAP_DIR) + os.chdir(LLVM_BOOTSTRAP_DIR) + bootstrap_args = base_cmake_args + [ + '-DLLVM_TARGETS_TO_BUILD=host', +@@ -473,11 +457,16 @@ + ] + if cc is not None: bootstrap_args.append('-DCMAKE_C_COMPILER=' + cc) + if cxx is not None: bootstrap_args.append('-DCMAKE_CXX_COMPILER=' + cxx) ++ RmCmakeCache('.') + RunCommand(['cmake'] + bootstrap_args + [LLVM_DIR], msvc_arch='x64') + RunCommand(['ninja'], msvc_arch='x64') + if args.run_tests: + RunCommand(['ninja', 'check-all'], msvc_arch='x64') + RunCommand(['ninja', 'install'], msvc_arch='x64') ++ if args.gcc_toolchain: ++ # Copy that gcc's stdlibc++.so.6 to the build dir, so the bootstrap ++ # compiler can start. ++ CopyFile(libstdcpp, os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'lib')) + + if sys.platform == 'win32': + cc = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang-cl.exe') +@@ -489,6 +478,12 @@ + else: + cc = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang') + cxx = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang++') ++ ++ if args.gcc_toolchain: ++ # Tell the bootstrap compiler to use a specific gcc prefix to search ++ # for standard library headers and shared object files. ++ cflags = ['--gcc-toolchain=' + args.gcc_toolchain] ++ cxxflags = ['--gcc-toolchain=' + args.gcc_toolchain] + print 'Building final compiler' + + if sys.platform == 'darwin': +@@ -543,7 +538,7 @@ + binutils_incdir = os.path.join(BINUTILS_DIR, 'Linux_x64/Release/include') + + # If building at head, define a macro that plugins can use for #ifdefing +- # out code that builds at head, but not at LLVM_WIN_REVISION or vice versa. ++ # out code that builds at head, but not at CLANG_REVISION or vice versa. + if use_head_revision: + cflags += ['-DLLVM_FORCE_HEAD_REVISION'] + cxxflags += ['-DLLVM_FORCE_HEAD_REVISION'] +@@ -555,8 +550,15 @@ + deployment_env = os.environ.copy() + deployment_env['MACOSX_DEPLOYMENT_TARGET'] = deployment_target + +- cmake_args = base_cmake_args + [ ++ cmake_args = [] ++ # TODO(thakis): Unconditionally append this to base_cmake_args instead once ++ # compiler-rt can build with clang-cl on Windows (http://llvm.org/PR23698) ++ cc_args = base_cmake_args if sys.platform != 'win32' else cmake_args ++ if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc) ++ if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx) ++ cmake_args += base_cmake_args + [ + '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir, ++ '-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly', + '-DCMAKE_C_FLAGS=' + ' '.join(cflags), + '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags), + '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags), +@@ -565,35 +567,44 @@ + '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR, + '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'), + '-DCHROMIUM_TOOLS=%s' % ';'.join(args.tools)] +- # TODO(thakis): Unconditionally append this to base_cmake_args instead once +- # compiler-rt can build with clang-cl on Windows (http://llvm.org/PR23698) +- cc_args = base_cmake_args if sys.platform != 'win32' else cmake_args +- if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc) +- if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx) + +- if not os.path.exists(LLVM_BUILD_DIR): +- os.makedirs(LLVM_BUILD_DIR) ++ EnsureDirExists(LLVM_BUILD_DIR) + os.chdir(LLVM_BUILD_DIR) ++ RmCmakeCache('.') + RunCommand(['cmake'] + cmake_args + [LLVM_DIR], + msvc_arch='x64', env=deployment_env) +- RunCommand(['ninja'], msvc_arch='x64') ++ ++ if args.gcc_toolchain: ++ # Copy in the right stdlibc++.so.6 so clang can start. ++ if not os.path.exists(os.path.join(LLVM_BUILD_DIR, 'lib')): ++ os.mkdir(os.path.join(LLVM_BUILD_DIR, 'lib')) ++ libstdcpp = subprocess.check_output( ++ [cxx] + cxxflags + ['-print-file-name=libstdc++.so.6']).rstrip() ++ CopyFile(libstdcpp, os.path.join(LLVM_BUILD_DIR, 'lib')) ++ ++ # TODO(thakis): Remove "-d explain" once http://crbug.com/569337 is fixed. ++ RunCommand(['ninja', '-d', 'explain'], msvc_arch='x64') + + if args.tools: + # If any Chromium tools were built, install those now. + RunCommand(['ninja', 'cr-install'], msvc_arch='x64') + + if sys.platform == 'darwin': +- CopyFile(os.path.join(LLVM_BUILD_DIR, 'libc++.1.dylib'), ++ CopyFile(os.path.join(libcxxbuild, 'libc++.1.dylib'), + os.path.join(LLVM_BUILD_DIR, 'bin')) + # See http://crbug.com/256342 + RunCommand(['strip', '-x', os.path.join(LLVM_BUILD_DIR, 'bin', 'clang')]) + elif sys.platform.startswith('linux'): + RunCommand(['strip', os.path.join(LLVM_BUILD_DIR, 'bin', 'clang')]) + +- # Do an x86 build of compiler-rt to get the 32-bit ASan run-time. ++ # Do an out-of-tree build of compiler-rt. ++ # On Windows, this is used to get the 32-bit ASan run-time. + # TODO(hans): Remove once the regular build above produces this. +- if not os.path.exists(COMPILER_RT_BUILD_DIR): +- os.makedirs(COMPILER_RT_BUILD_DIR) ++ # On Mac and Linux, this is used to get the regular 64-bit run-time. ++ # Do a clobbered build due to cmake changes. ++ if os.path.isdir(COMPILER_RT_BUILD_DIR): ++ RmTree(COMPILER_RT_BUILD_DIR) ++ os.makedirs(COMPILER_RT_BUILD_DIR) + os.chdir(COMPILER_RT_BUILD_DIR) + # TODO(thakis): Add this once compiler-rt can build with clang-cl (see + # above). +@@ -606,11 +617,17 @@ + '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags)] + if sys.platform != 'win32': + compiler_rt_args += ['-DLLVM_CONFIG_PATH=' + +- os.path.join(LLVM_BUILD_DIR, 'bin', 'llvm-config')] +- RunCommand(['cmake'] + compiler_rt_args + [LLVM_DIR], +- msvc_arch='x86', env=deployment_env) ++ os.path.join(LLVM_BUILD_DIR, 'bin', 'llvm-config'), ++ '-DSANITIZER_MIN_OSX_VERSION="10.7"'] ++ # compiler-rt is part of the llvm checkout on Windows but a stand-alone ++ # directory elsewhere, see the TODO above COMPILER_RT_DIR. ++ RmCmakeCache('.') ++ RunCommand(['cmake'] + compiler_rt_args + ++ [LLVM_DIR if sys.platform == 'win32' else COMPILER_RT_DIR], ++ msvc_arch='x86', env=deployment_env) + RunCommand(['ninja', 'compiler-rt'], msvc_arch='x86') + ++ # Copy select output to the main tree. + # TODO(hans): Make this (and the .gypi and .isolate files) version number + # independent. + if sys.platform == 'win32': +@@ -620,17 +637,35 @@ + else: + assert sys.platform.startswith('linux') + platform = 'linux' +- asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', +- VERSION, 'lib', platform) ++ asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', platform) ++ if sys.platform == 'win32': ++ # TODO(thakis): This too is due to compiler-rt being part of the checkout ++ # on Windows, see TODO above COMPILER_RT_DIR. ++ asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', ++ VERSION, 'lib', platform) + asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', + VERSION, 'lib', platform) +- CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, +- r'^.*-i386\.lib$') +- CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, +- r'^.*-i386\.dll$') ++ # Blacklists: ++ CopyDirectoryContents(os.path.join(asan_rt_lib_src_dir, '..', '..'), ++ os.path.join(asan_rt_lib_dst_dir, '..', '..'), ++ r'^.*blacklist\.txt$') ++ # Headers: ++ if sys.platform != 'win32': ++ CopyDirectoryContents( ++ os.path.join(COMPILER_RT_BUILD_DIR, 'include/sanitizer'), ++ os.path.join(LLVM_BUILD_DIR, 'lib/clang', VERSION, 'include/sanitizer')) ++ # Static and dynamic libraries: ++ CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir) ++ if sys.platform == 'darwin': ++ for dylib in glob.glob(os.path.join(asan_rt_lib_dst_dir, '*.dylib')): ++ # Fix LC_ID_DYLIB for the ASan dynamic libraries to be relative to ++ # @executable_path. ++ # TODO(glider): this is transitional. We'll need to fix the dylib ++ # name either in our build system, or in Clang. See also ++ # http://crbug.com/344836. ++ subprocess.call(['install_name_tool', '-id', ++ '@executable_path/' + os.path.basename(dylib), dylib]) + +- CopyFile(os.path.join(asan_rt_lib_src_dir, '..', '..', 'asan_blacklist.txt'), +- os.path.join(asan_rt_lib_dst_dir, '..', '..')) + + if sys.platform == 'win32': + # Make an extra copy of the sanitizer headers, to be put on the include path +@@ -640,22 +675,67 @@ + aux_sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', + VERSION, 'include_sanitizer', + 'sanitizer') +- if not os.path.exists(aux_sanitizer_include_dir): +- os.makedirs(aux_sanitizer_include_dir) ++ EnsureDirExists(aux_sanitizer_include_dir) + for _, _, files in os.walk(sanitizer_include_dir): + for f in files: + CopyFile(os.path.join(sanitizer_include_dir, f), + aux_sanitizer_include_dir) + ++ if args.with_android: ++ make_toolchain = os.path.join( ++ ANDROID_NDK_DIR, 'build', 'tools', 'make-standalone-toolchain.sh') ++ for target_arch in ['aarch64', 'arm', 'i686']: ++ # Make standalone Android toolchain for target_arch. ++ toolchain_dir = os.path.join( ++ LLVM_BUILD_DIR, 'android-toolchain-' + target_arch) ++ RunCommand([ ++ make_toolchain, ++ '--platform=android-' + ('21' if target_arch == 'aarch64' else '19'), ++ '--install-dir="%s"' % toolchain_dir, ++ '--system=linux-x86_64', ++ '--stl=stlport', ++ '--toolchain=' + { ++ 'aarch64': 'aarch64-linux-android-4.9', ++ 'arm': 'arm-linux-androideabi-4.9', ++ 'i686': 'x86-4.9', ++ }[target_arch]]) ++ # Android NDK r9d copies a broken unwind.h into the toolchain, see ++ # http://crbug.com/357890 ++ for f in glob.glob(os.path.join(toolchain_dir, 'include/c++/*/unwind.h')): ++ os.remove(f) ++ ++ # Build ASan runtime for Android in a separate build tree. ++ build_dir = os.path.join(LLVM_BUILD_DIR, 'android-' + target_arch) ++ if not os.path.exists(build_dir): ++ os.mkdir(os.path.join(build_dir)) ++ os.chdir(build_dir) ++ cflags = ['--target=%s-linux-androideabi' % target_arch, ++ '--sysroot=%s/sysroot' % toolchain_dir, ++ '-B%s' % toolchain_dir] ++ android_args = base_cmake_args + [ ++ '-DCMAKE_C_COMPILER=' + os.path.join(LLVM_BUILD_DIR, 'bin/clang'), ++ '-DCMAKE_CXX_COMPILER=' + os.path.join(LLVM_BUILD_DIR, 'bin/clang++'), ++ '-DLLVM_CONFIG_PATH=' + os.path.join(LLVM_BUILD_DIR, 'bin/llvm-config'), ++ '-DCMAKE_C_FLAGS=' + ' '.join(cflags), ++ '-DCMAKE_CXX_FLAGS=' + ' '.join(cflags), ++ '-DANDROID=1'] ++ RmCmakeCache('.') ++ RunCommand(['cmake'] + android_args + [COMPILER_RT_DIR]) ++ RunCommand(['ninja', 'libclang_rt.asan-%s-android.so' % target_arch]) ++ ++ # And copy it into the main build tree. ++ runtime = 'libclang_rt.asan-%s-android.so' % target_arch ++ for root, _, files in os.walk(build_dir): ++ if runtime in files: ++ shutil.copy(os.path.join(root, runtime), asan_rt_lib_dst_dir) ++ + # Run tests. + if args.run_tests or use_head_revision: + os.chdir(LLVM_BUILD_DIR) +- RunCommand(GetVSVersion().SetupScript('x64') + +- ['&&', 'ninja', 'cr-check-all']) ++ RunCommand(['ninja', 'cr-check-all'], msvc_arch='x64') + if args.run_tests: + os.chdir(LLVM_BUILD_DIR) +- RunCommand(GetVSVersion().SetupScript('x64') + +- ['&&', 'ninja', 'check-all']) ++ RunCommand(['ninja', 'check-all'], msvc_arch='x64') + + WriteStampFile(PACKAGE_VERSION) + print 'Clang update was successful.' +@@ -663,31 +743,6 @@ + + + def main(): +- if not sys.platform in ['win32', 'cygwin']: +- # For non-Windows, fall back to update.sh. +- # TODO(hans): Make update.py replace update.sh completely. +- +- # This script is called by gclient. gclient opens its hooks subprocesses +- # with (stdout=subprocess.PIPE, stderr=subprocess.STDOUT) and then does +- # custom output processing that breaks printing '\r' characters for +- # single-line updating status messages as printed by curl and wget. +- # Work around this by setting stderr of the update.sh process to stdin (!): +- # gclient doesn't redirect stdin, and while stdin itself is read-only, a +- # dup()ed sys.stdin is writable, try +- # fd2 = os.dup(sys.stdin.fileno()); os.write(fd2, 'hi') +- # TODO: Fix gclient instead, http://crbug.com/95350 +- if '--no-stdin-hack' in sys.argv: +- sys.argv.remove('--no-stdin-hack') +- stderr = None +- else: +- try: +- stderr = os.fdopen(os.dup(sys.stdin.fileno())) +- except: +- stderr = sys.stderr +- return subprocess.call( +- [os.path.join(os.path.dirname(__file__), 'update.sh')] + sys.argv[1:], +- stderr=stderr) +- + parser = argparse.ArgumentParser(description='Build Clang.') + parser.add_argument('--bootstrap', action='store_true', + help='first build clang with CC, then with itself.') +@@ -695,26 +750,24 @@ + help="run only if the script thinks clang is needed") + parser.add_argument('--force-local-build', action='store_true', + help="don't try to download prebuild binaries") ++ parser.add_argument('--gcc-toolchain', help='set the version for which gcc ' ++ 'version be used for building; --gcc-toolchain=/opt/foo ' ++ 'picks /opt/foo/bin/gcc') + parser.add_argument('--print-revision', action='store_true', + help='print current clang revision and exit.') ++ parser.add_argument('--print-clang-version', action='store_true', ++ help='print current clang version (e.g. x.y.z) and exit.') + parser.add_argument('--run-tests', action='store_true', + help='run tests after building; only for local builds') + parser.add_argument('--tools', nargs='*', + help='select which chrome tools to build', + default=['plugins', 'blink_gc_plugin']) +- parser.add_argument('--without-patches', action='store_false', +- help="don't apply patches (default)", dest='with_patches', +- default=True) +- +- # For now, these flags are only used for the non-Windows flow, but argparser +- # gets mad if it sees a flag it doesn't recognize. +- parser.add_argument('--no-stdin-hack', action='store_true') +- ++ parser.add_argument('--without-android', action='store_false', ++ help='don\'t build Android ASan runtime (linux only)', ++ dest='with_android', ++ default=sys.platform.startswith('linux')) + args = parser.parse_args() + +- if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')): +- print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).' +- return 0 + if args.if_needed: + is_clang_required = False + # clang is always used on Mac and Linux. +@@ -730,8 +783,16 @@ + is_clang_required = True + if not is_clang_required: + return 0 ++ if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')): ++ print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).' ++ return 0 ++ ++ if use_head_revision: ++ # TODO(hans): Remove after the next roll. ++ global VERSION ++ VERSION = '3.9.0' + +- global LLVM_WIN_REVISION, PACKAGE_VERSION ++ global CLANG_REVISION, PACKAGE_VERSION + if args.print_revision: + if use_head_revision: + print GetSvnRevision(LLVM_DIR) +@@ -739,6 +800,10 @@ + print PACKAGE_VERSION + return 0 + ++ if args.print_clang_version: ++ sys.stdout.write(VERSION) ++ return 0 ++ + # Don't buffer stdout, so that print statements are immediately flushed. + # Do this only after --print-revision has been handled, else we'll get + # an error message when this script is run from gn for some reason. +@@ -747,12 +812,13 @@ + if use_head_revision: + # Use a real revision number rather than HEAD to make sure that the stamp + # file logic works. +- LLVM_WIN_REVISION = GetSvnRevision(LLVM_REPO_URL) +- PACKAGE_VERSION = LLVM_WIN_REVISION + '-0' ++ CLANG_REVISION = GetSvnRevision(LLVM_REPO_URL) ++ PACKAGE_VERSION = CLANG_REVISION + '-0' + + args.force_local_build = True +- # Skip local patches when using HEAD: they probably don't apply anymore. +- args.with_patches = False ++ if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): ++ # Only build the Android ASan rt on ToT bots when targetting Android. ++ args.with_android = False + + return UpdateClang(args) + diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix similarity index 96% rename from pkgs/development/libraries/qt-5/5.6/qtwebengine.nix rename to pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 2a437e62eca..dba3611683e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -53,6 +53,9 @@ qtSubmodule { libcap pciutils ]; + patches = [ + ./chromium-clang-update-py.patch + ]; postInstall = '' cat > $out/libexec/qt.conf < Date: Fri, 4 Nov 2016 23:04:05 -0400 Subject: [PATCH 231/336] cowsay: init at 3.03+dfsg1-16 --- pkgs/tools/misc/cowsay/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/cowsay/default.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix new file mode 100644 index 00000000000..0a7b079445d --- /dev/null +++ b/pkgs/tools/misc/cowsay/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation { + name = "cowsay-3.03+dfsg1-16"; + + src = fetchgit { + url = https://anonscm.debian.org/git/collab-maint/cowsay.git; + rev = "acb946c166fa3b9526b9c471ef1330f9f89f9c8b"; + sha256 = "1ji66nrdcc8sh79hwils3nbaj897s352r5wp7kzjwiym8bm2azk6"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + bash ./install.sh $out + ''; + + meta = { + description = "A program which generates ASCII pictures of a cow with a message"; + homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.rob ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6672f3550a4..0d918e26b04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,6 +741,8 @@ in corosync = callPackage ../servers/corosync { }; + cowsay = callPackage ../tools/misc/cowsay { }; + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { }; From ac59e2f184fe0beeec2920dc9d6d9830813d9212 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 4 Nov 2016 23:05:26 -0400 Subject: [PATCH 232/336] tar: patch for CVE-2016-6321 https://lwn.net/Vulnerabilities/705216/ --- .../archivers/gnutar/CVE-2016-6321.patch | 35 +++++++++++++++++++ pkgs/tools/archivers/gnutar/default.nix | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/archivers/gnutar/CVE-2016-6321.patch diff --git a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch new file mode 100644 index 00000000000..c53d92891fc --- /dev/null +++ b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch @@ -0,0 +1,35 @@ +commit 7340f67b9860ea0531c1450e5aa261c50f67165d +Author: Paul Eggert +Date: Sat Oct 29 21:04:40 2016 -0700 + + When extracting, skip ".." members + + * NEWS: Document this. + * src/extract.c (extract_archive): Skip members whose names + contain "..". + +diff --git a/src/extract.c b/src/extract.c +index f982433..7904148 100644 +--- a/src/extract.c ++++ b/src/extract.c +@@ -1629,12 +1629,20 @@ extract_archive (void) + { + char typeflag; + tar_extractor_t fun; ++ bool skip_dotdot_name; + + fatal_exit_hook = extract_finish; + + set_next_block_after (current_header); + ++ skip_dotdot_name = (!absolute_names_option ++ && contains_dot_dot (current_stat_info.orig_file_name)); ++ if (skip_dotdot_name) ++ ERROR ((0, 0, _("%s: Member name contains '..'"), ++ quotearg_colon (current_stat_info.orig_file_name))); ++ + if (!current_stat_info.file_name[0] ++ || skip_dotdot_name + || (interactive_option + && !confirm ("extract", current_stat_info.file_name))) + { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 16660fea3e7..80c84236b8d 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = [ ]; # FIXME: remove on another stdenv rebuild + patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ From 986510de4562c532beb3c9d794f56e2d8015c9fc Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:11:37 +0900 Subject: [PATCH 233/336] logcheck module: use enum --- nixos/modules/services/logging/logcheck.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a8a214b2155..27ed5374f56 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -55,9 +55,9 @@ let levelOption = mkOption { default = "server"; - type = types.str; + type = types.enum [ "workstation" "server" "paranoid" ]; description = '' - Set the logcheck level. Either "workstation", "server", or "paranoid". + Set the logcheck level. ''; }; From 321e2a915375231d48fb41493266cdf2095330a9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 5 Nov 2016 07:55:04 +0100 Subject: [PATCH 234/336] unifont: 9.0.03 -> 9.0.04 Also change download URL to use GNU mirrors. --- pkgs/data/fonts/unifont/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index b4078720d0a..682c42afa3e 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "9.0.03"; + version = "9.0.04"; ttf = fetchurl { - url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf"; - sha256 = "00j97r658xl33zgi66glgbx2s7j9q52cj4iq7z1rrf3p38xzgbff"; + url = "mirror://gnu/unifont/${name}/${name}.ttf"; + sha256 = "052waajjdry67jjl7vy984padyzdrkhf5gylgbnvj90q6d52j02z"; }; pcf = fetchurl { - url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz"; - sha256 = "1w3gaz8afc3q7svgm4hmgjhvi9pxkmgsib8sscgi52c7ff0mhq9f"; + url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; + sha256 = "0736qmlzsf4xlipj4vzihafkigc3xjisxnwcqhl9dzkhxfjq9612"; }; buildInputs = [ mkfontscale mkfontdir ]; From 5ad7cf37283a1efb4e74d0798d6d7579042719e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Nov 2016 08:15:42 +0100 Subject: [PATCH 235/336] Revert #20139: mesa: 12.0.1 -> 13.0.0 x.y.0 aren't considered stable for general deployment; let's wait a bit for 13.0.1. This reverts commit 1c6b3bdc3532a6d2394cef6db1889fc9f0b94ff7, reversing changes made to d0ae7b973d8a4f064324a058a83385a68b177e72. --- pkgs/development/libraries/mesa/default.nix | 10 ++++++--- .../libraries/mesa/dlopen-absolute-paths.diff | 22 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/mesa/dlopen-absolute-paths.diff diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3475a5997ea..5ff884fd3c1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "13.0.0"; + version = "12.0.3"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "09yp4wh89srxqqzsnrqgw4gmx68mgxic5nbrprl6l1l2zzmv9vcl"; + sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; }; prePatch = "patchShebangs ."; @@ -51,7 +51,11 @@ stdenv.mkDerivation { patches = [ ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch - ]; + ] ++ optional stdenv.isLinux + (substituteAll { + src = ./dlopen-absolute-paths.diff; + libudev = systemd.lib; + }); postPatch = '' substituteInPlace src/egl/main/egldriver.c \ diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff new file mode 100644 index 00000000000..9a522657223 --- /dev/null +++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff @@ -0,0 +1,22 @@ +diff --git a/loader.c b/loader.c +index 4fdf3c2..69ea22d 100644 +--- a/src/loader/loader.c ++++ b/src/loader/loader.c +@@ -112,7 +112,7 @@ static void *udev_handle = NULL; + static void * + udev_dlopen_handle(void) + { +- char name[80]; ++ char name[256]; + unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY; + int version; + +@@ -126,7 +126,7 @@ udev_dlopen_handle(void) + /* First try opening an already linked libudev, then try loading one */ + do { + for (version = 1; version >= 0; version--) { +- snprintf(name, sizeof(name), "libudev.so.%d", version); ++ snprintf(name, sizeof(name), "@libudev@/lib/libudev.so.%d", version); + udev_handle = dlopen(name, flags); + if (udev_handle) + return udev_handle; From 0033f6076ee5c462722bf6077c40ff7949ae6020 Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sat, 5 Nov 2016 08:51:49 +0000 Subject: [PATCH 236/336] agrep: init at 3.41.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In category `tools`, subcategory `text`, add a package definition for the program [`agrep`] [1] — "Approximate `grep` for fast fuzzy string searching". I have tested this patch per nixpkgs manual section 11.1 ("Making patches"). [1]: --- pkgs/tools/text/agrep/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/agrep/default.nix diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix new file mode 100644 index 00000000000..81c09840848 --- /dev/null +++ b/pkgs/tools/text/agrep/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "agrep-${version}"; + version = "3.41.5"; + + src = fetchFromGitHub { + owner = "Wikinaut"; + repo = "agrep"; + # This repository has numbered versions, but not Git tags. + rev = "eef20411d605d9d17ead07a0ade75046f2728e21"; + sha256 = "14addnwspdf2mxpqyrw8b84bb2257y43g5ccy4ipgrr91fmxq2sk"; + }; + + installPhase = '' + install -Dm 555 agrep -t "$out/bin" + install -Dm 444 docs/* -t "$out/doc" + ''; + + meta = { + description = "Approximate grep for fast fuzzy string searching"; + homepage = "https://www.tgries.de/agrep/"; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b9977b4cff..f50f1991036 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -367,6 +367,8 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; + agrep = callPackage ../tools/text/agrep { }; + aha = callPackage ../tools/text/aha { }; ahcpd = callPackage ../tools/networking/ahcpd { }; From c6fcd28e2d47b106df493d5ed9b36ed81990ae4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Nov 2016 09:55:51 +0100 Subject: [PATCH 237/336] jing-trang: add back and update; removed in #20142 This fixes the tarball, as we use jing to validate nixpkgs manual! /cc maintainer @bjornfor. --- pkgs/tools/text/xml/jing-trang/default.nix | 41 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/text/xml/jing-trang/default.nix diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix new file mode 100644 index 00000000000..423db6e71ff --- /dev/null +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, jre, jdk, ant, saxon }: + +stdenv.mkDerivation rec { + name = "jing-trang-${version}"; + version = "20150603"; + + src = fetchFromGitHub { + owner = "relaxng"; + repo = "jing-trang"; + rev = "54b9b1f4e67cd79c7987750d8c9dcfc014af98c3"; # needed to compile with jdk8 + sha256 = "0wa569xjb7ihhcaazz32y2b0dv092lisjz77isz1gfb1wvf53di5"; + }; + + buildInputs = [ jdk ant saxon ]; + + preBuild = "CLASSPATH='${saxon}/saxon.jar'; echo CLASSPATH=$CLASSPATH; ant"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp ./build/*.jar "$out/share/java/" + + for tool in jing trang; do + cat > "$out/bin/$tool" < Date: Thu, 3 Nov 2016 02:12:14 +0100 Subject: [PATCH 238/336] ocaml-astring: init at 0.8.3 --- .../ocaml-modules/astring/default.nix | 43 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/ocaml-modules/astring/default.nix diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix new file mode 100644 index 00000000000..d172b0f7463 --- /dev/null +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, opam}: + +buildOcaml rec { + version = "0.8.3"; + name = "astring"; + + src = fetchurl { + url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz"; + sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + }; + + unpackCmd = "tar -xf $curSrc"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build + ''; + + installPhase = '' + opam-installer --script --prefix=$out astring.install | sh + ln -s $out/lib/astring $out/lib/ocaml/${ocaml.version}/site-lib/ + ''; + + meta = { + homepage = http://erratique.ch/software/astring; + description = "Alternative String module for OCaml"; + longDescription = '' + Astring exposes an alternative String module for OCaml. This module tries + to balance minimality and expressiveness for basic, index-free, string + processing and provides types and functions for substrings, string sets + and string maps. + + Remaining compatible with the OCaml String module is a non-goal. + The String module exposed by Astring has exception safe functions, removes + deprecated and rarely used functions, alters some signatures and names, + adds a few missing functions and fully exploits OCaml's newfound string + immutability. + ''; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d2c41d89a62..c8f36e14dfb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -22,6 +22,8 @@ let asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + astring = callPackage ../development/ocaml-modules/astring { }; + async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; async_find = callPackage ../development/ocaml-modules/async_find { }; From 250f3feec2c3153c0f9a2e5cf723428166620c0f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 5 Nov 2016 08:09:26 +0100 Subject: [PATCH 239/336] python-lxml: fix build on darwin by disabling format hardening --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c6acd3ddd9..51d9647b929 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13650,6 +13650,8 @@ in { buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = http://lxml.de; @@ -13668,6 +13670,8 @@ in { buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + meta = { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = http://lxml.de; From fbb33ab8c950b8a8a4dff6ea25db43afbeeb121c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Nov 2016 10:15:54 +0100 Subject: [PATCH 240/336] saxon: use our standard share/java/*.jar location --- pkgs/development/libraries/java/saxon/default.nix | 11 ++++++++--- .../development/libraries/java/saxon/unzip-builder.sh | 3 +++ pkgs/tools/text/xml/jing-trang/default.nix | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 464776569cb..1677376230b 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "saxon-6.5.3"; @@ -8,8 +8,13 @@ stdenv.mkDerivation { md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; }; - inherit unzip; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; + + # still leaving in root as well, in case someone is relying on that + preFixup = '' + mkdir -p "$out/share/java" + cp -s "$out"/*.jar "$out/share/java/" + ''; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/java/saxon/unzip-builder.sh b/pkgs/development/libraries/java/saxon/unzip-builder.sh index 48b3d4509d0..8ac35568f0b 100755 --- a/pkgs/development/libraries/java/saxon/unzip-builder.sh +++ b/pkgs/development/libraries/java/saxon/unzip-builder.sh @@ -1,3 +1,6 @@ source $stdenv/setup unzip $src -d $out + +fixupPhase + diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 423db6e71ff..53b3bbdaba4 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ jdk ant saxon ]; - preBuild = "CLASSPATH='${saxon}/saxon.jar'; echo CLASSPATH=$CLASSPATH; ant"; + preBuild = "ant"; installPhase = '' mkdir -p "$out"/{share/java,bin} From cb6a81c6075d05294480a96353d5a40a706e003a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Nov 2016 10:16:35 +0100 Subject: [PATCH 241/336] jing-trang: fixup indentation problems --- pkgs/tools/text/xml/jing-trang/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 53b3bbdaba4..36ff976a6c1 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { cp ./build/*.jar "$out/share/java/" for tool in jing trang; do - cat > "$out/bin/$tool" < "$out/bin/$tool" < Date: Sat, 5 Nov 2016 11:02:04 +0100 Subject: [PATCH 242/336] nixos manual: clarify "attributes of function" --- nixos/doc/manual/configuration/customizing-packages.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index f938d6dd67e..8aa01fb57a0 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -45,8 +45,8 @@ elements.) overrideAttrs. While the override mechanism above overrides the arguments of a package function, overrideAttrs allows -changing the attributes of the function. This -permits changing any aspect of the package, such as the source code. +changing the attributes passed to mkDerivation. +This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say: From 45bff42b1ecf82384676e2764cbcd81425678326 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 5 Nov 2016 14:15:44 +0300 Subject: [PATCH 243/336] zeroadPackages.zeroad-data: disable Hydra builds --- pkgs/games/0ad/data.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 98603251e59..6b4dface0e1 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://wildfiregames.com/0ad/"; license = licenses.cc-by-sa-30; platforms = platforms.linux; + hydraPlatforms = []; }; } From dd8f60fbd94c09ae6bbc4553079cd199a1635dfc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 5 Nov 2016 14:43:16 +0300 Subject: [PATCH 244/336] haskellPackages.dbus: fix for new DBUS_SESSION_BUS_ADDRESS format --- .../haskell-modules/configuration-common.nix | 5 ++- .../patches/hdbus-semicolons.patch | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/haskell-modules/patches/hdbus-semicolons.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6849fa03908..69c0d073bc0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -291,7 +291,6 @@ self: super: { bitcoin-api-extra = dontCheck super.bitcoin-api-extra; bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw concurrent-dns-cache = dontCheck super.concurrent-dns-cache; - dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw @@ -1067,4 +1066,8 @@ self: super: { # horribly outdated (X11 interface changed a lot) sindre = markBroken super.sindre; + # https://github.com/jmillikin/haskell-dbus/pull/7 + # http://hydra.cryp.to/build/498404/log/raw + dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch); + } diff --git a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch new file mode 100644 index 00000000000..dc7ece8f3e8 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch @@ -0,0 +1,34 @@ +From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Sat, 5 Nov 2016 14:27:04 +0300 +Subject: [PATCH] getSessionAddress: take first bus address from + semicolon-separated variable + +--- + lib/DBus/Address.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs +index 72ac99d..596b18c 100644 +--- a/lib/DBus/Address.hs ++++ b/lib/DBus/Address.hs +@@ -18,6 +18,7 @@ module DBus.Address where + import qualified Control.Exception + import Data.Char (digitToInt, ord, chr) + import Data.List (intercalate) ++import Data.Maybe (listToMaybe) + import qualified Data.Map + import Data.Map (Map) + import qualified System.Environment +@@ -152,7 +153,7 @@ getSystemAddress = do + getSessionAddress :: IO (Maybe Address) + getSessionAddress = do + env <- getenv "DBUS_SESSION_BUS_ADDRESS" +- return (env >>= parseAddress) ++ return $ maybe Nothing listToMaybe (env >>= parseAddresses) + + -- | Returns the address in the environment variable + -- @DBUS_STARTER_ADDRESS@, which must be set. +-- +2.10.1 + From 5593f61a51d4ac356e09c5061d1cbcff5a86d6c3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Nov 2016 16:42:39 +0300 Subject: [PATCH 245/336] nvidia-texture-tools: 1388 -> 2.1.0 --- .../nvidia-texture-tools/default.nix | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index f35d363e575..a010ae9bd1a 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,43 +1,41 @@ -{ stdenv, fetchsvn, cmake, libpng, ilmbase, libtiff, zlib, libjpeg -, mesa, libX11 -}: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - # No support yet for cg, cuda, glew, glut, openexr. + name = "nvidia-texture-tools-${version}"; + version = "2.1.0"; - name = "nvidia-texture-tools-1388"; - - src = fetchsvn { - url = "http://nvidia-texture-tools.googlecode.com/svn/trunk"; - rev = "1388"; - sha256 = "0pwxqx5l16nqidzm6mwd3rd4gbbknkz6q8cxnvf7sggjpbcvm2d6"; + src = fetchFromGitHub { + owner = "castano"; + repo = "nvidia-texture-tools"; + rev = version; + sha256 = "0p8ja0k323nkgm07z0qlslg6743vimy9rf3wad2968az0vwzjjyx"; }; - buildInputs = [ cmake libpng ilmbase libtiff zlib libjpeg mesa libX11 ]; + nativeBuildInputs = [ cmake ]; - hardeningDisable = [ "format" ]; - - patchPhase = '' - # Fix build due to missing dependnecies. - echo 'target_link_libraries(bc7 nvmath)' >> src/nvtt/bc7/CMakeLists.txt - echo 'target_link_libraries(bc6h nvmath)' >> src/nvtt/bc6h/CMakeLists.txt + outputs = [ "out" "dev" "lib" ]; + postPatch = '' # Make a recently added pure virtual function just virtual, # to keep compatibility. sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h - - # Fix building shared libraries. - sed -i 's/SET(NVIMAGE_SHARED TRUE)/SET(NVIMAGE_SHARED TRUE)\nSET(NVTHREAD_SHARED TRUE)/' CMakeLists.txt ''; cmakeFlags = [ "-DNVTT_SHARED=TRUE" ]; - meta = { + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$lib" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; - homepage = "http://developer.nvidia.com/object/texture_tools.html"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/castano/nvidia-texture-tools"; + license = licenses.mit; + platforms = platforms.linux; }; } From 2d18cf75e0fa14fae92f1b8ce76742fd4d90eae8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 25 Oct 2016 16:11:00 +0300 Subject: [PATCH 246/336] steam: add xkeyboardconfig --- pkgs/games/steam/chrootenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 8c86371ecab..c53418b6523 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -52,6 +52,7 @@ in buildFHSUserEnv rec { gst_all_1.gst-plugins-ugly libdrm mono + xorg.xkeyboardconfig (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; From 8a31e0d2263bd08a9533a17189d593c7c9d47054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 5 Nov 2016 13:31:09 -0200 Subject: [PATCH 247/336] xfce4-whiskermenu-plugin: 1.5.3 -> 1.6.1 (#20166) --- pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index e4c44865583..a9c4da810c1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; - version = "1.5.3"; + version = "1.6.1"; name = "${p_name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; rev = "v${version}"; - sha256 = "07gmf9x3pw6xajklj0idahbnv0psnkhiqhb88bmkp344jirsx6ba"; + sha256 = "19hldrrgy7qmrncv5rfsclybycjp9rjfnslhm996h62d2p675qpc"; }; nativeBuildInputs = [ cmake pkgconfig intltool ]; From 2f912bf0a3b0142b6e514faea00d703a3f7aeaeb Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 24 Oct 2016 00:34:03 +0200 Subject: [PATCH 248/336] dnscrypt-proxy service: auto-update upstream resolver list By default, we use the list of public DNSCrypt resolvers provided by dnscrypt-proxy upstream. The list is updated at regular intervals. --- .../services/networking/dnscrypt-proxy.nix | 122 ++++++++++++++---- 1 file changed, 95 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 5a24db8ccba..82bf178f4cb 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -5,15 +5,25 @@ let apparmorEnabled = config.security.apparmor.enable; dnscrypt-proxy = pkgs.dnscrypt-proxy; cfg = config.services.dnscrypt-proxy; + stateDirectory = "/var/lib/dnscrypt-proxy"; localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; - daemonArgs = - [ "--local-address=${localAddress}" - (optionalString cfg.tcpOnly "--tcp-only") - (optionalString cfg.ephemeralKeys "-E") - ] - ++ resolverArgs; + # The minisign public key used to sign the upstream resolver list. + # This is somewhat more flexible than preloading the key as an + # embedded string. + upstreamResolverListPubKey = pkgs.fetchurl { + url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub; + sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; + }; + + # Internal flag indicating whether the upstream resolver list is used + useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; + + resolverList = + if (cfg.resolverList != null) + then cfg.resolverList + else "${stateDirectory}/dnscrypt-resolvers.csv"; resolverArgs = if (cfg.customResolver != null) then @@ -22,9 +32,16 @@ let "--provider-key=${cfg.customResolver.key}" ] else - [ "--resolvers-list=${cfg.resolverList}" - "--resolver-name=${toString cfg.resolverName}" + [ "--resolvers-list=${resolverList}" + "--resolver-name=${cfg.resolverName}" ]; + + # The final command line arguments passed to the daemon + daemonArgs = + [ "--local-address=${localAddress}" ] + ++ optional cfg.tcpOnly "--tcp-only" + ++ optional cfg.ephemeralKeys "-E" + ++ resolverArgs; in { @@ -66,24 +83,20 @@ in default = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' - The name of the upstream DNSCrypt resolver to use, taken from the - list named in the resolverList option. - The default resolver is located in Holland, supports DNS security - extensions, and claims to not keep logs. + The name of the upstream DNSCrypt resolver to use, taken from + ${resolverList}. The default resolver is + located in Holland, supports DNS security extensions, and + claims to not keep logs. ''; }; resolverList = mkOption { + default = null; + type = types.nullOr types.path; description = '' - The list of upstream DNSCrypt resolvers. By default, we use the most - recent list published by upstream. + List of DNSCrypt resolvers. The default is to use the list of + public resolvers provided by upstream. ''; - example = literalExample "${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"; - default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv; - sha256 = "1i9wzw4zl052h5nyp28bwl8d66cgj0awvjhw5wgwz0warkjl1g8g"; - }; - defaultText = "pkgs.fetchurl { url = ...; sha256 = ...; }"; }; customResolver = mkOption { @@ -150,7 +163,7 @@ in } ]; - security.apparmor.profiles = mkIf apparmorEnabled (singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' + security.apparmor.profiles = optional apparmorEnabled (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, /dev/urandom r, @@ -177,9 +190,9 @@ in ${getLib pkgs.lz4}/lib/liblz4.so.* mr, ${getLib pkgs.attr}/lib/libattr.so.* mr, - ${cfg.resolverList} r, + ${resolverList} r, } - '')); + ''); users.users.dnscrypt-proxy = { description = "dnscrypt-proxy daemon user"; @@ -188,11 +201,61 @@ in }; users.groups.dnscrypt-proxy = {}; + systemd.services.init-dnscrypt-proxy-statedir = optionalAttrs useUpstreamResolverList { + description = "Initialize dnscrypt-proxy state directory"; + script = '' + mkdir -pv ${stateDirectory} + chown -c dnscrypt-proxy:dnscrypt-proxy ${stateDirectory} + cp --preserve=timestamps -uv \ + ${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv \ + ${stateDirectory} + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + + systemd.services.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + description = "Update list of DNSCrypt resolvers"; + + requires = [ "init-dnscrypt-proxy-statedir.service" ]; + after = [ "init-dnscrypt-proxy-statedir.service" ]; + + path = with pkgs; [ curl minisign ]; + script = '' + cd ${stateDirectory} + curl -fSsL -o dnscrypt-resolvers.csv.tmp \ + https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv + curl -fSsL -o dnscrypt-resolvers.csv.minisig.tmp \ + https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig + mv dnscrypt-resolvers.csv.minisig{.tmp,} + minisign -q -V -p ${upstreamResolverListPubKey} \ + -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig + mv dnscrypt-resolvers.csv{.tmp,} + ''; + + serviceConfig = { + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = true; + }; + }; + + systemd.timers.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + timerConfig = { + OnBootSec = "5min"; + OnUnitActiveSec = "6h"; + }; + wantedBy = [ "timers.target" ]; + }; + systemd.sockets.dnscrypt-proxy = { description = "dnscrypt-proxy listening socket"; socketConfig = { - ListenStream = "${localAddress}"; - ListenDatagram = "${localAddress}"; + ListenStream = localAddress; + ListenDatagram = localAddress; }; wantedBy = [ "sockets.target" ]; }; @@ -200,8 +263,13 @@ in systemd.services.dnscrypt-proxy = { description = "dnscrypt-proxy daemon"; - after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service"; - requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service"; + after = [ "network.target" ] + ++ optional apparmorEnabled "apparmor.service" + ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; + + requires = [ "dnscrypt-proxy.socket "] + ++ optional apparmorEnabled "apparmor.service" + ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; serviceConfig = { Type = "simple"; From 806e652e5194df934fadb167f8ba44a1a3065c1d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 5 Nov 2016 16:10:10 +0100 Subject: [PATCH 249/336] dnscrypt-proxy test: simplification --- nixos/tests/dnscrypt-proxy.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index b686e9582a7..26409949ec6 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -22,8 +22,6 @@ import ./make-test.nix ({ pkgs, ... }: { }; testScript = '' - $client->start; - $client->waitForUnit("sockets.target"); $client->waitForUnit("dnsmasq"); # The daemon is socket activated; sending a single ping should activate it. From ee63779005e806c4ce6ef2380c94292552a2e5ef Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 5 Nov 2016 18:35:34 +0100 Subject: [PATCH 250/336] graylog: 2.1.1 -> 2.1.2 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 829c524113b..ae26bad5bc8 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0p7vx6b4k6lzxi0v9x44wbrvplw93288lpixpwckc0xx0r7js07z"; + sha256 = "0jwm1l3s00rh22gqvkg730h8xm4h1y1dr60m4s5xbz8qzdkk8rax"; }; dontBuild = true; From c4f41a0a6101d73eb42da412ed98b70391c8349e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Jul 2016 19:12:24 +0200 Subject: [PATCH 251/336] remotebox: 2.0 -> 2.1 --- pkgs/applications/virtualization/remotebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 37086f52730..63389153a0a 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0c73i53wdjd2m2sdgq3r3xp30irxh5z5rak2rk79yb686s6bv759"; + sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; From cd2d81ab52af5935a92e6cdc8e1c7e68722913b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Oct 2016 18:11:53 +0200 Subject: [PATCH 252/336] mcelog: 138 -> 142 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f9969fa79fd..590d2b4a854 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "138"; + version = "142"; src = fetchFromGitHub { - sha256 = "039ycn5m3gx4n0kppxl35wcrkyva6lv64qhlqhh7034qkbqbhqiy"; + sha256 = "1cqx7w75d570vxqi2gk9bkqqclakkhp4kjanv5j3nhqwg3p38zyv"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From aa0a7194e944ad4d23c5c5f9e11508b03bc06592 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Nov 2016 15:17:32 +0100 Subject: [PATCH 253/336] zstd: 1.0.0 -> 1.1.1 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e981a108914..d966175f50d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { - sha256 = "0h8r8vlk8v28cxxgdp7h7dcygbpn8g95wffsvhzybxhfvkrlw6f2"; + sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; From 784bd713ccde88e5e03fbb462fd89db0d95489ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Nov 2016 15:21:45 +0100 Subject: [PATCH 254/336] dub: 1.0.0 -> 1.1.0 --- pkgs/development/tools/build-managers/dub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 634427daaa2..7f178babf32 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dub-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { - sha256 = "07s52hmh9jc3i4jfx4j4a91m44qrr933pwfwczzijhybj2wmpjhh"; + sha256 = "1smzlfs5gjmrlghccdgn04qzy5b8l0xm8y2virayb2adrwqviscm"; rev = "v${version}"; repo = "dub"; owner = "D-Programming-Language"; From 50a579f1921e580727127cb679c259639a421aab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Nov 2016 16:24:01 +0100 Subject: [PATCH 255/336] dmd: 2.067.1 -> 2.070.2 --- pkgs/development/compilers/dmd/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 12e8745ece1..e92ea095f72 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, unzip, curl, makeWrapper }: -stdenv.mkDerivation { - name = "dmd-2.067.1"; +stdenv.mkDerivation rec { + name = "dmd-${version}"; + version = "2.070.2"; src = fetchurl { - url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; - sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; + url = "http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.zip"; + sha256 = "1pbhxxf41v816j0aky3q2pcd8a6phy3363l7vr5r5pg8ps3gl701"; }; buildInputs = [ unzip curl makeWrapper ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation { # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd src/dmd - make -f posix.mak INSTALL_DIR=$out + make -f posix.mak INSTALL_DIR=$out AUTO_BOOTSTRAP=1 export DMD=$PWD/dmd cd ../druntime make -f posix.mak INSTALL_DIR=$out DMD=$DMD From 9254567f1882e25c3c0fd29c92b0c1e3f59d2497 Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Sat, 5 Nov 2016 20:46:19 +0100 Subject: [PATCH 256/336] youtube-dl: 2016-11-02 -> 2016-11-04 (#20196) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8f1ac7546bb..21828f2c278 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.02"; + version = "2016.11.04"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "97777924c3df763d3f2259c9a7f227a01e787ccd452be198191a4a848a7632d7"; + sha256 = "9622b29b81587278a00e39e4206e7c52555d240cbbb44242f237660169e8d531"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From ea6434251702724904288965a574b7cf5d454400 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:13:17 -0500 Subject: [PATCH 257/336] kmenuedit: depend on khotkeys --- pkgs/desktops/kde-5/plasma/kmenuedit.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix index 3adb77a0051..f10bf6bb3cd 100644 --- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix +++ b/pkgs/desktops/kde-5/plasma/kmenuedit.nix @@ -1,11 +1,14 @@ -{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support +{ + plasmaPackage, + ecm, kdoctools, + kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, + sonnet }: plasmaPackage { name = "kmenuedit"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes + kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet ]; } From cef9476a0c2dd26d303677b023faba25b84aec34 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:13:33 -0500 Subject: [PATCH 258/336] ksysguard: depend on lm_sensors --- pkgs/desktops/kde-5/plasma/ksysguard.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix index dcde867dffa..d38f0ed10bc 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -1,11 +1,15 @@ -{ plasmaPackage, ecm, kdoctools, kconfig -, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard, qtwebkit +{ + plasmaPackage, + ecm, kdoctools, + lm_sensors, + kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, + knewstuff, libksysguard, lm_sensors, qtwebkit }: plasmaPackage { name = "ksysguard"; nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ lm_sensors ]; propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard kdelibs4support ki18n qtwebkit From 75aa98d589e784349b0875e678a7c43d359b9975 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:13:42 -0500 Subject: [PATCH 259/336] libksysguard: depend on qtwebkit --- .../kde-5/plasma/libksysguard/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix index b6ca3dfa26d..2d81d061f4c 100644 --- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix +++ b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix @@ -1,7 +1,9 @@ -{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion -, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons -, kwindowsystem, plasma-framework, qtscript, qtx11extras -, kconfig, ki18n, kiconthemes +{ + plasmaPackage, + ecm, + kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, + kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, + qtx11extras }: plasmaPackage { @@ -9,11 +11,10 @@ plasmaPackage { patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - nativeBuildInputs = [ - ecm - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras - kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript + kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets + kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras + qtwebkit ]; } From 87e75a6f88ea7dcf1277d05e71c759336fbee920 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:13:54 -0500 Subject: [PATCH 260/336] oxygen: depend on kwayland --- pkgs/desktops/kde-5/plasma/oxygen.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 3c54055a633..44a7575526f 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,16 +1,16 @@ -{ plasmaPackage, ecm, ki18n, kcmutils, kconfig -, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras +{ + plasmaPackage, + ecm, makeQtWrapper, + frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, + ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: plasmaPackage { name = "oxygen"; - nativeBuildInputs = [ - ecm makeQtWrapper - ]; + nativeBuildInputs = [ ecm makeQtWrapper ]; propagatedBuildInputs = [ - kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion - frameworkintegration ki18n kwindowsystem qtx11extras + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras ]; postInstall = '' wrapQtProgram "$out/bin/oxygen-demo5" From f509ddf4eadae8b1f0726473ad4bee2762bbd257 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:14:03 -0500 Subject: [PATCH 261/336] plasma-desktop: depend on ibus --- .../kde-5/plasma/plasma-desktop/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index e2b1acd198f..7e8823e2db9 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -1,20 +1,20 @@ -{ plasmaPackage, substituteAll, ecm, kdoctools -, attica, baloo, boost, fontconfig, kactivities, kactivities-stats -, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons -, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications -, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev -, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, utillinux -, qtquickcontrols, ksysguard +{ + plasmaPackage, substituteAll, + ecm, kdoctools, + attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, + kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, + kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, + kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, + libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework, + plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev, + xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux }: plasmaPackage rec { name = "plasma-desktop"; nativeBuildInputs = [ ecm kdoctools ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff + attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput baloo kactivities From d9fa71cd8df3b85252fbf606f4be5fc11296e3ad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 12:14:12 -0500 Subject: [PATCH 262/336] kimageformats: depend on karchive and ilmbase --- .../libraries/kde-frameworks/kimageformats.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index f05da98f553..631cac4217c 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,11 +1,14 @@ -{ kdeFramework, lib -, ecm -, ilmbase +{ + kdeFramework, lib, + ecm, + ilmbase, karchive }: kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; + buildInputs = [ ilmbase ]; + propagatedBuildInputs = [ karchive ]; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; } From 77f6453fe85b38b25c24091fcd86bee74f97f62d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Nov 2016 20:55:02 +0100 Subject: [PATCH 263/336] haskellPackages: libsystemd-journal unjailbreak upper bound got fixed --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 69c0d073bc0..82073ff0989 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1058,8 +1058,6 @@ self: super: { dataenc = doJailbreak super.dataenc; libsystemd-journal = overrideCabal super.libsystemd-journal (old: { - # https://github.com/ocharles/libsystemd-journal/pull/17 - jailbreak = true; librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); From f74d48e9fe7095244bb730dc5501321eedbd1719 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Nov 2016 15:07:42 -0500 Subject: [PATCH 264/336] ksysguard: fix evaluation error --- pkgs/desktops/kde-5/plasma/ksysguard.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix index d38f0ed10bc..f7e5cced708 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -3,7 +3,7 @@ ecm, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard, lm_sensors, qtwebkit + knewstuff, libksysguard, qtwebkit }: plasmaPackage { From 1fe1cdecb24de63be577a2df538da03bbe96cd1d Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 4 Nov 2016 13:33:59 +0900 Subject: [PATCH 265/336] types: loeOf -> listOf --- nixos/doc/manual/development/option-types.xml | 6 ------ nixos/modules/config/shells-environment.nix | 2 +- nixos/modules/config/system-environment.nix | 2 +- nixos/modules/services/misc/taskserver/default.nix | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 8871b02cebf..9ef7bb30a57 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -99,12 +99,6 @@ type. Multiple definitions are merged according to the value. - - types.loeOf t - A list or an element of t type. - Multiple definitions are merged according to the - values. - types.nullOr t null or type diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index f458bc39ada..8147fed39d0 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -41,7 +41,7 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = types.attrsOf (types.loeOf types.str); + type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 3362400326d..6011e354ece 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -23,7 +23,7 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = types.attrsOf (types.loeOf types.str); + type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 233c47684b7..ca82a733f6f 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -292,7 +292,7 @@ in { }; allowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -306,7 +306,7 @@ in { }; disallowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' From b27932a65b4f59fea29375e8a11649700371884e Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Wed, 2 Nov 2016 23:29:31 +0100 Subject: [PATCH 266/336] v8-3_16_14 tweaks for the build on darwin The build was originally failing due to a missing libtool. Trying to add the buildInput "libtool" did not work out, since a few command line arguments are not supported. I've applied the same workaround as for "xcodebuild". The second change is about the install step, where the path of "libv8.dylib" was just slightly different. --- pkgs/development/libraries/v8/3.16.14.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index d9addab3030..91a8763d43f 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' ln -s /usr/bin/xcodebuild $TMPDIR + ln -s /usr/bin/libtool $TMPDIR export PATH=$TMPDIR:$PATH '' + '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ @@ -57,8 +58,8 @@ stdenv.mkDerivation rec { installPhase = '' install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + ${if stdenv.isDarwin then '' + install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" '' else '' install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" ''} From e14de56613fc8e42fb6249031efe9e7abbb65286 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 7 Sep 2016 10:03:32 +0900 Subject: [PATCH 267/336] module system: extensible option types --- lib/modules.nix | 32 ++-- lib/options.nix | 2 +- lib/types.nix | 142 ++++++++++++++---- .../development/option-declarations.xml | 88 +++++++++++ nixos/doc/manual/development/option-types.xml | 116 ++++++++++---- nixos/doc/manual/release-notes/rl-1703.xml | 5 +- nixos/modules/installer/tools/nixos-option.sh | 2 +- 7 files changed, 317 insertions(+), 70 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 8db17c60579..e66d6a6926c 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -231,12 +231,20 @@ rec { correspond to the definition of 'loc' in 'opt.file'. */ mergeOptionDecls = loc: opts: foldl' (res: opt: - if opt.options ? default && res ? default || - opt.options ? example && res ? example || - opt.options ? description && res ? description || - opt.options ? apply && res ? apply || - # Accept to merge options which have identical types. - opt.options ? type && res ? type && opt.options.type.name != res.type.name + let t = res.type; + t' = opt.options.type; + mergedType = t.typeMerge t'.functor; + typesMergeable = mergedType != null; + typeSet = if (bothHave "type") && typesMergeable + then { type = mergedType; } + else {}; + bothHave = k: opt.options ? ${k} && res ? ${k}; + in + if bothHave "default" || + bothHave "example" || + bothHave "description" || + bothHave "apply" || + (bothHave "type" && (! typesMergeable)) then throw "The option `${showOption loc}' in `${opt.file}' is already declared in ${showFiles res.declarations}." else @@ -258,7 +266,7 @@ rec { in opt.options // res // { declarations = res.declarations ++ [opt.file]; options = submodules; - } + } // typeSet ) { inherit loc; declarations = []; options = []; } opts; /* Merge all the definitions of an option to produce the final @@ -422,12 +430,14 @@ rec { options = opt.options or (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); f = tp: + let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); + in if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if tp.name == "attribute set of option sets" then types.attrsOf (types.submodule options) - else if tp.name == "list or attribute set of option sets" then types.loaOf (types.submodule options) - else if tp.name == "list of option sets" then types.listOf (types.submodule options) - else if tp.name == "null or option set" then types.nullOr (types.submodule options) + else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) + else if optionSetIn "loaOf" then types.loaOf (types.submodule options) + else if optionSetIn "listOf" then types.listOf (types.submodule options) + else if optionSetIn "nullOr" then types.nullOr (types.submodule options) else tp; in if opt.type.getSubModules or null == null diff --git a/lib/options.nix b/lib/options.nix index 444ec37e6ea..2092b65bbc3 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -92,7 +92,7 @@ rec { internal = opt.internal or false; visible = opt.visible or true; readOnly = opt.readOnly or false; - type = opt.type.name or null; + type = opt.type.description or null; } // (if opt ? example then { example = scrubOptionValue opt.example; } else {}) // (if opt ? default then { default = scrubOptionValue opt.default; } else {}) diff --git a/lib/types.nix b/lib/types.nix index 991fa0e5c29..26523f59f25 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -17,10 +17,43 @@ rec { }; + # Default type merging function + # takes two type functors and return the merged type + defaultTypeMerge = f: f': + let wrapped = f.wrapped.typeMerge f'.wrapped.functor; + payload = f.binOp f.payload f'.payload; + in + # cannot merge different types + if f.name != f'.name + then null + # simple types + else if (f.wrapped == null && f'.wrapped == null) + && (f.payload == null && f'.payload == null) + then f.type + # composed types + else if (f.wrapped != null && f'.wrapped != null) && (wrapped != null) + then f.type wrapped + # value types + else if (f.payload != null && f'.payload != null) && (payload != null) + then f.type payload + else null; + + # Default type functor + defaultFunctor = name: { + inherit name; + type = types."${name}" or null; + wrapped = null; + payload = null; + binOp = a: b: null; + }; + isOptionType = isType "option-type"; mkOptionType = - { # Human-readable representation of the type. + { # Human-readable representation of the type, should be equivalent to + # the type function name. name + , # Description of the type, defined recursively by embedding the the wrapped type if any. + description ? null , # Function applied to each definition that should return true if # its type-correct, false otherwise. check ? (x: true) @@ -36,12 +69,26 @@ rec { getSubOptions ? prefix: {} , # List of modules if any, or null if none. getSubModules ? null - , # Function for building the same option type with a different list of + , # Function for building the same option type with a different list of # modules. substSubModules ? m: null + , # Function that merge type declarations. + # internal, takes a functor as argument and returns the merged type. + # returning null means the type is not mergeable + typeMerge ? defaultTypeMerge functor + , # The type functor. + # internal, representation of the type as an attribute set. + # name: name of the type + # type: type function. + # wrapped: the type wrapped in case of compound types. + # payload: values of the type, two payloads of the same type must be + # combinable with the binOp binary operation. + # binOp: binary operation that merge two payloads of the same type. + functor ? defaultFunctor name }: { _type = "option-type"; - inherit name check merge getSubOptions getSubModules substSubModules; + inherit name check merge getSubOptions getSubModules substSubModules typeMerge functor; + description = if description == null then name else description; }; @@ -52,29 +99,39 @@ rec { }; bool = mkOptionType { - name = "boolean"; + name = "bool"; + description = "boolean"; check = isBool; merge = mergeEqualOption; }; - int = mkOptionType { - name = "integer"; + int = mkOptionType rec { + name = "int"; + description = "integer"; check = isInt; merge = mergeOneOption; }; str = mkOptionType { - name = "string"; + name = "str"; + description = "string"; check = isString; merge = mergeOneOption; }; # Merge multiple definitions by concatenating them (with the given # separator between the values). - separatedString = sep: mkOptionType { - name = "string"; + separatedString = sep: mkOptionType rec { + name = "separatedString"; + description = "string"; check = isString; merge = loc: defs: concatStringsSep sep (getValues defs); + functor = (defaultFunctor name) // { + payload = sep; + binOp = sepLhs: sepRhs: + if sepLhs == sepRhs then sepLhs + else null; + }; }; lines = separatedString "\n"; @@ -86,7 +143,8 @@ rec { string = separatedString ""; attrs = mkOptionType { - name = "attribute set"; + name = "attrs"; + description = "attribute set"; check = isAttrs; merge = loc: foldl' (res: def: mergeAttrs res def.value) {}; }; @@ -114,8 +172,9 @@ rec { # drop this in the future: list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf; - listOf = elemType: mkOptionType { - name = "list of ${elemType.name}s"; + listOf = elemType: mkOptionType rec { + name = "listOf"; + description = "list of ${elemType.description}s"; check = isList; merge = loc: defs: map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: @@ -132,10 +191,12 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - attrsOf = elemType: mkOptionType { - name = "attribute set of ${elemType.name}s"; + attrsOf = elemType: mkOptionType rec { + name = "attrsOf"; + description = "attribute set of ${elemType.description}s"; check = isAttrs; merge = loc: defs: mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs: @@ -147,6 +208,7 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; # List or attribute set of ... @@ -165,18 +227,21 @@ rec { def; listOnly = listOf elemType; attrOnly = attrsOf elemType; - in mkOptionType { - name = "list or attribute set of ${elemType.name}s"; + in mkOptionType rec { + name = "loaOf"; + description = "list or attribute set of ${elemType.description}s"; check = x: isList x || isAttrs x; merge = loc: defs: attrOnly.merge loc (imap convertIfList defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; # List or element of ... - loeOf = elemType: mkOptionType { - name = "element or list of ${elemType.name}s"; + loeOf = elemType: mkOptionType rec { + name = "loeOf"; + description = "element or list of ${elemType.description}s"; check = x: isList x || elemType.check x; merge = loc: defs: let @@ -189,18 +254,22 @@ rec { else if !isString res then throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." else res; + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - uniq = elemType: mkOptionType { - inherit (elemType) name check; + uniq = elemType: mkOptionType rec { + name = "uniq"; + inherit (elemType) description check; merge = mergeOneOption; getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: uniq (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - nullOr = elemType: mkOptionType { - name = "null or ${elemType.name}"; + nullOr = elemType: mkOptionType rec { + name = "nullOr"; + description = "null or ${elemType.description}"; check = x: x == null || elemType.check x; merge = loc: defs: let nrNulls = count (def: def.value == null) defs; in @@ -211,6 +280,7 @@ rec { getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; submodule = opts: @@ -236,6 +306,12 @@ rec { args = { name = ""; }; }).options; getSubModules = opts'; substSubModules = m: submodule m; + functor = (defaultFunctor name) // { + # Merging of submodules is done as part of mergeOptionDecls, as we have to annotate + # each submodule with its location. + payload = []; + binOp = lhs: rhs: []; + }; }; enum = values: @@ -245,23 +321,35 @@ rec { else if builtins.isInt v then builtins.toString v else ''<${builtins.typeOf v}>''; in - mkOptionType { - name = "one of ${concatMapStringsSep ", " show values}"; + mkOptionType rec { + name = "enum"; + description = "one of ${concatMapStringsSep ", " show values}"; check = flip elem values; merge = mergeOneOption; + functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); }; }; - either = t1: t2: mkOptionType { - name = "${t1.name} or ${t2.name}"; + either = t1: t2: mkOptionType rec { + name = "either"; + description = "${t1.description} or ${t2.description}"; check = x: t1.check x || t2.check x; merge = mergeOneOption; + typeMerge = f': + let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; + mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; + in + if (name == f'.name) && (mt1 != null) && (mt2 != null) + then functor.type mt1 mt2 + else null; + functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set"; + name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; + description = "option set"; }; # Augment the given type with an additional type check function. diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index 7be5e9d51d4..ce432a7fa6c 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,4 +65,92 @@ options = { +
Extensible Option + Types + + Extensible option types is a feature that allow to extend certain types + declaration through multiple module files. + This feature only work with a restricted set of types, namely + enum and submodules and any composed + forms of them. + + Extensible option types can be used for enum options + that affects multiple modules, or as an alternative to related + enable options. + + As an example, we will take the case of display managers. There is a + central display manager module for generic display manager options and a + module file per display manager backend (slim, kdm, gdm ...). + + + There are two approach to this module structure: + + + Managing the display managers independently by adding an + enable option to every display manager module backend. (NixOS) + + Managing the display managers in the central module by + adding an option to select which display manager backend to use. + + + + + Both approachs have problems. + + Making backends independent can quickly become hard to manage. For + display managers, there can be only one enabled at a time, but the type + system can not enforce this restriction as there is no relation between + each backend enable option. As a result, this restriction + has to be done explicitely by adding assertions in each display manager + backend module. + + On the other hand, managing the display managers backends in the + central module will require to change the central module option every time + a new backend is added or removed. + + By using extensible option types, it is possible to create a placeholder + option in the central module (), and to extend it in each backend module (, ). + + As a result, displayManager.enable option values can + be added without changing the main service module file and the type system + automatically enforce that there can only be a single display manager + enabled. + +Extensible type + placeholder in the service module + +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; + +Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>slim</literal> module + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "slim" ]); +}; + +Extending + <literal>services.foo.backend</literal> in the <literal>kdm</literal> + module + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "kdm" ]); +}; + +The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only use + the type argument. + +Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) + or with types; listOf (enum [ "foo" "bar" ]). + +
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 9ef7bb30a57..8e6ac53ad48 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -62,23 +62,45 @@ A string. Multiple definitions are concatenated with a collon ":". - - types.separatedString - sep - A string with a custom separator - sep, e.g. types.separatedString - "|". - +
Value Types + + Value types are type that take a value parameter. The only value type + in the library is enum. + + + + types.enum l + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged. + + + types.separatedString + sep + A string with a custom separator + sep, e.g. types.separatedString + "|". + + + types.submodule o + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in . + + +
+
Composed Types - Composed types allow to create complex types by taking another type(s) - or value(s) as parameter(s). - It is possible to compose types multiple times, e.g. with types; - nullOr (enum [ "left" "right" ]). + Composed types are types that take a type as parameter. listOf + int and either int str are examples of + composed types. @@ -111,12 +133,6 @@ merged. It is used to ensure option definitions are declared only once. - - types.enum l - One element of the list l, e.g. - types.enum [ "left" "right" ]. Multiple definitions - cannot be merged - types.either t1 t2 @@ -125,14 +141,6 @@ str. Multiple definitions cannot be merged. - - types.submodule o - A set of sub options o. - o can be an attribute set or a function - returning an attribute set. Submodules are used in composed types to - create modular options. Submodule are detailed in . -
@@ -191,7 +199,6 @@ options.mod = mkOption { type = with types; listOf (submodule modOptions); }; -
Composed with <literal>listOf</literal> When composed with listOf, submodule allows multiple @@ -317,9 +324,13 @@ code before creating a new type. name - A string representation of the type function name, name - usually changes accordingly parameters passed to - types. + A string representation of the type function + name. + + + definition + Description of the type used in documentation. Give + information of the type and any of its arguments. check @@ -382,6 +393,53 @@ code before creating a new type. type parameter, this function should be defined as m: composedType (elemType.substSubModules m). + + typeMerge + A function to merge multiple type declarations. Takes the + type to merge functor as parameter. A + null return value means that type cannot be + merged. + + + f + The type to merge + functor. + + + Note: There is a generic defaultTypeMerge that + work with most of value and composed types. + + + + functor + An attribute set representing the type. It is used for type + operations and has the following keys: + + + type + The type function. + + + wrapped + Holds the type parameter for composed types. + + + + payload + Holds the value parameter for value types. + The types that have a payload are the + enum, separatedString and + submodule types. + + + binOp + A binary operation that can merge the payloads of two + same types. Defined as a function that take two payloads as + parameters and return the payloads merged. + + + +
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index efff8b895a1..743f3dce230 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -75,7 +75,10 @@ following incompatible changes: - + Module type system have a new extensible option types feature that + allow to extend certain types, such as enum, through multiple option + declarations of the same option across multiple modules. + diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 17c17d05e28..27eacda48a8 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -256,7 +256,7 @@ if isOption opt then // optionalAttrs (opt ? default) { inherit (opt) default; } // optionalAttrs (opt ? example) { inherit (opt) example; } // optionalAttrs (opt ? description) { inherit (opt) description; } - // optionalAttrs (opt ? type) { typename = opt.type.name; } + // optionalAttrs (opt ? type) { typename = opt.type.description; } // optionalAttrs (opt ? options) { inherit (opt) options; } // { # to disambiguate the xml output. From bb57eeccde9245a9fd7710daa81380d89a498bdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Nov 2016 22:56:13 +0100 Subject: [PATCH 268/336] Revert "dmd: 2.067.1 -> 2.070.2" This reverts commit 50a579f1921e580727127cb679c259639a421aab. Building with AUTO_BOOTSTRAP=1 will download pre-compiled dmd binaries during the build phase: https://github.com/NixOS/nixpkgs/pull/15256#r62290617 --- pkgs/development/compilers/dmd/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index e92ea095f72..12e8745ece1 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, unzip, curl, makeWrapper }: -stdenv.mkDerivation rec { - name = "dmd-${version}"; - version = "2.070.2"; +stdenv.mkDerivation { + name = "dmd-2.067.1"; src = fetchurl { - url = "http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.zip"; - sha256 = "1pbhxxf41v816j0aky3q2pcd8a6phy3363l7vr5r5pg8ps3gl701"; + url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; + sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; }; buildInputs = [ unzip curl makeWrapper ]; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd src/dmd - make -f posix.mak INSTALL_DIR=$out AUTO_BOOTSTRAP=1 + make -f posix.mak INSTALL_DIR=$out export DMD=$PWD/dmd cd ../druntime make -f posix.mak INSTALL_DIR=$out DMD=$DMD From c9bb753584de7075dd12f7e6aaa8ef66b47fb017 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 00:21:37 +0100 Subject: [PATCH 269/336] dmd: {b -> nativeB}uildInputs; remove unreferenced curl --- pkgs/development/compilers/dmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 12e8745ece1..66264346102 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, curl, makeWrapper }: +{ stdenv, fetchurl, unzip, makeWrapper }: stdenv.mkDerivation { name = "dmd-2.067.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; }; - buildInputs = [ unzip curl makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' # Allow to use "clang++", commented in Makefile From a66f9b2a02872fe010455bd033807a937da1eb0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Nov 2016 00:29:11 +0100 Subject: [PATCH 270/336] dmd: 2.067.1 -> 2.070.2 dmd 2.070.2 requires a working dmd compiler to build. Instead of downloading a pre-compiled binary blob, keep the previous version (which does properly build from source) around as dmd_2_067_1, and use that to bootstrap the new version. --- pkgs/development/compilers/dmd/2.067.1.nix | 74 ++++++++++++++++++++++ pkgs/development/compilers/dmd/default.nix | 17 +++-- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/compilers/dmd/2.067.1.nix diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix new file mode 100644 index 00000000000..66264346102 --- /dev/null +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, unzip, makeWrapper }: + +stdenv.mkDerivation { + name = "dmd-2.067.1"; + + src = fetchurl { + url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; + sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + # Allow to use "clang++", commented in Makefile + substituteInPlace src/dmd/posix.mak \ + --replace g++ clang++ \ + --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_ + + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd src/dmd + make -f posix.mak INSTALL_DIR=$out + export DMD=$PWD/dmd + cd ../druntime + make -f posix.mak INSTALL_DIR=$out DMD=$DMD + cd ../phobos + make -f posix.mak INSTALL_DIR=$out DMD=$DMD + cd ../.. + ''; + + installPhase = '' + cd src/dmd + mkdir $out + mkdir $out/bin + cp dmd $out/bin + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 + + cd ../phobos + mkdir $out/lib + ${let bits = if stdenv.is64bit then "64" else "32"; + osname = if stdenv.isDarwin then "osx" else "linux"; in + "cp generated/${osname}/release/${bits}/libphobos2.a $out/lib" + } + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set CC "$""{CC:-$CC""}" + + cd $out/bin + tee dmd.conf << EOF + [Environment] + DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--no-warn-search-mismatch -L--export-dynamic"} + EOF + ''; + + meta = with stdenv.lib; { + description = "D language compiler"; + homepage = http://dlang.org/; + license = licenses.free; # parts under different licenses + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 66264346102..3435b94c32e 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, unzip, makeWrapper }: +{ stdenv, fetchurl +, makeWrapper, unzip, which -stdenv.mkDerivation { - name = "dmd-2.067.1"; +# Versions 2.070.2 and up require a working dmd compiler to build: +, bootstrapDmd }: + +stdenv.mkDerivation rec { + name = "dmd-${version}"; + version = "2.070.2"; src = fetchurl { - url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip; - sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; + url = "http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.zip"; + sha256 = "1pbhxxf41v816j0aky3q2pcd8a6phy3363l7vr5r5pg8ps3gl701"; }; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ bootstrapDmd makeWrapper unzip which ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' # Allow to use "clang++", commented in Makefile diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8739da74a70..b325689af46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1397,7 +1397,10 @@ in disper = callPackage ../tools/misc/disper { }; - dmd = callPackage ../development/compilers/dmd { }; + dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix { }; + dmd = callPackage ../development/compilers/dmd { + bootstrapDmd = dmd_2_067_1; + }; dmg2img = callPackage ../tools/misc/dmg2img { }; From 624de33091cba7210f4628f19c803e8bc37b336d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Nov 2016 03:19:46 +0100 Subject: [PATCH 271/336] jasper: 1.900.2 -> 1.900.21 (security) Incorporates fixes from all patches for the CVEs listed and some more security-related issues like: http://www.openwall.com/lists/oss-security/2016/11/04/11 --- pkgs/development/libraries/jasper/default.nix | 18 +- .../jasper/jasper-CVE-2014-8137-noabort.diff | 16 - .../jasper/jasper-CVE-2014-8137-variant2.diff | 45 --- .../jasper/jasper-CVE-2014-8138.diff | 16 - .../jasper/jasper-CVE-2014-8157.diff | 12 - .../jasper/jasper-CVE-2014-8158.diff | 329 ------------------ .../jasper/jasper-CVE-2014-9029.diff | 31 -- .../jasper/jasper-CVE-2016-1867.diff | 11 - 8 files changed, 2 insertions(+), 476 deletions(-) delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff delete mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index e2061df88f0..895d72dd7a0 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,27 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.2"; + name = "jasper-1.900.21"; src = fetchurl { url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a"; + sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79"; }; - patches = [ - ./jasper-CVE-2014-8137-variant2.diff - ./jasper-CVE-2014-8137-noabort.diff - - (fetchpatch { # CVE-2016-2089 - url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; - sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; - }) - (fetchpatch { # CVE-2015-5203 - url = "https://github.com/mdadams/jasper/commit/e73bb58f99fec0bf9c5d8866e010fcf736a53b9a.patch"; - sha256 = "1r6hxbnhpnb7q6p2kbdxc1cpph3ic851x2hy477yv5c3qmrbx9bk"; - }) - ]; - # newer reconf to recognize a multiout flag nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff deleted file mode 100644 index 47b57d5c809..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff +++ /dev/null @@ -1,16 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967284&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 -@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in - case JP2_COLR_ICC: - iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, - dec->colr->data.colr.iccplen); -- assert(iccprof); -+ if (!iccprof) { -+ jas_eprintf("error: failed to parse ICC profile\n"); -+ goto error; -+ } - jas_iccprof_gethdr(iccprof, &icchdr); - jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); - jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff deleted file mode 100644 index 243300dd70e..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff +++ /dev/null @@ -1,45 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967283&action=diff - ---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 -@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr - return 0; - - error: -- jas_icccurv_destroy(attrval); - return -1; - } - -@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca - #endif - return 0; - error: -- jas_icctxtdesc_destroy(attrval); - return -1; - } - -@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv - goto error; - return 0; - error: -- if (txt->string) -- jas_free(txt->string); - return -1; - } - -@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr - goto error; - return 0; - error: -- jas_icclut8_destroy(attrval); - return -1; - } - -@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt - goto error; - return 0; - error: -- jas_icclut16_destroy(attrval); - return -1; - } - diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff deleted file mode 100644 index cbf0899d807..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff +++ /dev/null @@ -1,16 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 -@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in - /* Determine the type of each component. */ - if (dec->cdef) { - for (i = 0; i < dec->numchans; ++i) { -+ /* Is the channel number reasonable? */ -+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { -+ jas_eprintf("error: invalid channel number in CDEF box\n"); -+ goto error; -+ } - jas_image_setcmpttype(dec->image, - dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], - jp2_getct(jas_image_clrspc(dec->image), diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff deleted file mode 100644 index ebfc1b2d0f2..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 jasper-1.900.1/src/libjasper/jpc/jpc_dec.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 2015-01-19 16:59:36.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2015-01-19 17:07:41.609863268 +0100 -@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t - dec->curtileendoff = 0; - } - -- if (JAS_CAST(int, sot->tileno) > dec->numtiles) { -+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) { - jas_eprintf("invalid tile number in SOT marker segment\n"); - return -1; - } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff deleted file mode 100644 index ce9e4b497f3..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff +++ /dev/null @@ -1,329 +0,0 @@ -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 2015-01-19 17:25:28.730195502 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2015-01-19 17:27:20.214663127 +0100 -@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numcols >= 2) { - hstartcol = (numcols + 1 - parity) >> 1; -@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numcols + 1 - parity) >> 1; - -@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { -@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - srcptr += JPC_QMFB_COLGRPSIZE; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { -@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - srcptr += numcols; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff deleted file mode 100644 index 01db7f03cdf..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff +++ /dev/null @@ -1,31 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=961994&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 -@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t - jpc_coc_t *coc = &ms->parms.coc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, coc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in COC marker segment\n"); - return -1; - } -@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t - jpc_rgn_t *rgn = &ms->parms.rgn; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { -+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in RGN marker segment\n"); - return -1; - } -@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t - jpc_qcc_t *qcc = &ms->parms.qcc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in QCC marker segment\n"); - return -1; - } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff deleted file mode 100644 index b2dce8d8e70..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2016-01-14 14:22:24.569056412 +0100 -@@ -429,7 +429,7 @@ - } - - for (pi->compno = pchg->compnostart, pi->picomp = -- &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno, -+ &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno, - ++pi->picomp) { - pirlvl = pi->picomp->pirlvls; - pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn + \ No newline at end of file From 7f2a1e709b8b74257aba5a6ab493e9e3fe49171e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Nov 2016 03:40:31 +0100 Subject: [PATCH 272/336] openjpeg_2_0: remove, unused in nixpkgs --- pkgs/development/libraries/openjpeg/2.0.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 deletions(-) delete mode 100644 pkgs/development/libraries/openjpeg/2.0.nix diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix deleted file mode 100644 index dd30b18e97c..00000000000 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.0.1"; - branch = "2"; - revision = "version.2.0.1"; - sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b325689af46..c20868a5503 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8659,7 +8659,6 @@ in openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; - openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { }; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; From 98fb9ded4e223ce2fa70b289a29b8bf9854b3917 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 6 Nov 2016 03:47:22 +0100 Subject: [PATCH 273/336] light: 0.9 -> 1.0 (#20193) Update to version 1.0 --- pkgs/os-specific/linux/light/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 5ca9f69f879..1c44c0d78a8 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, help2man }: stdenv.mkDerivation rec { - version = "0.9"; + version = "1.0"; name = "light-${version}"; src = fetchurl { url = "https://github.com/haikarainen/light/archive/v${version}.tar.gz"; - sha256 = "1dnzkkg307izvw76gvzsl2vpxd2a1grxg5h82ix505rb9nnmn0d6"; + sha256 = "974608ee42ffe85cfd23184306d56d86ec4e6f4b0518bafcb7b3330998b1af64"; }; + buildInputs = [ help2man ]; installPhase = "mkdir -p $out/bin; cp light $out/bin/"; + preFixup = "make man; mkdir -p $out/man/man1; mv light.1.gz $out/man/man1"; + meta = { description = "GNU/Linux application to control backlights"; homepage = https://haikarainen.github.io/light/; From 606726005fac1f9ede7d7cf96a37b914ef9e956c Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 6 Nov 2016 11:56:14 +0800 Subject: [PATCH 274/336] snd: 15.9 -> 16.9 (#20202) --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8abf7cea6eb..da76d7f16db 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.9"; + name = "snd-16.9"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0hs9ailgaphgyi3smnrpwksvdww85aa7szqgi6l6d2jwfx9g4bhd"; + sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp"; }; nativeBuildInputs = [ pkgconfig ]; From 721c3d48e1532ec5400e8b00ef6e94a4a470a0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 6 Nov 2016 08:11:33 +0100 Subject: [PATCH 275/336] i2pd: 2.9.0 -> 2.10.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f12b2900e67..56af632e616 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1xwcq7lklma0daamp9z76l9mgr3glpvicjgsr645rjhdv8a0mqwp"; + sha256 = "0lw0vcibp3v5xz855h4x2rs3ff7yx86znzjfnfri348wg413js5c"; }; buildInputs = [ boost zlib openssl ]; From 4009dbe543cbe09d05d3fa4bff47cdb7859b5e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 6 Nov 2016 08:11:57 +0100 Subject: [PATCH 276/336] nixos: i2pd, update config options --- nixos/modules/services/networking/i2pd.nix | 230 +++++++++++++++++++-- 1 file changed, 211 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 926857a0ff4..578376764eb 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -10,7 +10,7 @@ let extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; - toYesNo = b: if b then "yes" else "no"; + toYesNo = b: if b then "true" else "false"; mkEndpointOpt = name: addr: port: { enable = mkEnableOption name; @@ -31,6 +31,17 @@ let }; }; + mkKeyedEndpointOpt = name: addr: port: keyFile: + (mkEndpointOpt name addr port) // { + keys = mkOption { + type = types.str; + default = ""; + description = '' + File to persist ${lib.toUpper name} keys. + ''; + }; + }; + commonTunOpts = let i2cpOpts = { length = mkOption { @@ -63,19 +74,49 @@ let }; } // mkEndpointOpt name "127.0.0.1" 0; - i2pdConf = pkgs.writeText "i2pd.conf" '' - ipv6 = ${toYesNo cfg.enableIPv6} - notransit = ${toYesNo cfg.notransit} - floodfill = ${toYesNo cfg.floodfill} - ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - ${flip concatMapStrings - (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: let portStr = toString proto.port; in '' - [${proto.name}] - address = ${proto.address} - port = ${toString proto.port} - enabled = ${toYesNo proto.enable} - '') + i2pdConf = pkgs.writeText "i2pd.conf" + '' + ipv4 = ${toYesNo cfg.enableIPv4} + ipv6 = ${toYesNo cfg.enableIPv6} + notransit = ${toYesNo cfg.notransit} + floodfill = ${toYesNo cfg.floodfill} + netid = ${toString cfg.netid} + ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } + ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} + + [limits] + transittunnels = ${toString cfg.limits.transittunnels} + + [upnp] + enabled = ${toYesNo cfg.upnp.enable} + name = ${cfg.upnp.name} + + [precomputation] + elgamal = ${toYesNo cfg.precomputation.elgamal} + + [reseed] + verify = ${toYesNo cfg.reseed.verify} + file = ${cfg.reseed.file} + urls = ${builtins.concatStringsSep "," cfg.reseed.urls} + + [addressbook] + defaulturl = ${cfg.addressbook.defaulturl} + subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} + ${flip concatMapStrings + (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) + (proto: let portStr = toString proto.port; in + '' + [${proto.name}] + enabled = ${toYesNo proto.enable} + address = ${proto.address} + port = ${toString proto.port} + ${if proto ? keys then "keys = ${proto.keys}" else ""} + ${if proto ? auth then "auth = ${toYesNo proto.auth}" else ""} + ${if proto ? user then "user = ${proto.user}" else ""} + ${if proto ? pass then "pass = ${proto.pass}" else ""} + ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} + ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} + '') } ''; @@ -114,7 +155,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh ${if isNull cfg.extIp then extip else ""} - ${pkgs.i2pd}/bin/i2pd --log=1 \ + ${pkgs.i2pd}/bin/i2pd \ --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \ --conf=${i2pdConf} \ --tunconf=${i2pdTunnelConf} @@ -135,6 +176,8 @@ in default = false; description = '' Enables I2Pd as a running service upon activation. + Please read http://i2pd.readthedocs.io/en/latest/ for further + configuration help. ''; }; @@ -162,6 +205,22 @@ in ''; }; + netid = mkOption { + type = types.int; + default = 2; + description = '' + I2P overlay netid. + ''; + }; + + bandwidth = mkOption { + type = with types; nullOr int; + default = null; + description = '' + Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000) + ''; + }; + port = mkOption { type = with types; nullOr int; default = null; @@ -170,6 +229,14 @@ in ''; }; + enableIPv4 = mkOption { + type = types.bool; + default = true; + description = '' + Enables IPv4 connectivity. Enabled by default. + ''; + }; + enableIPv6 = mkOption { type = types.bool; default = false; @@ -178,16 +245,141 @@ in ''; }; - proto.http = mkEndpointOpt "http" "127.0.0.1" 7070; + upnp = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables UPnP. + ''; + }; + + name = mkOption { + type = types.str; + default = "I2Pd"; + description = '' + Name i2pd appears in UPnP forwardings list. + ''; + }; + }; + + precomputation.elgamal = mkOption { + type = types.bool; + default = false; + description = '' + Use ElGamal precomputated tables. + ''; + }; + + reseed = { + verify = mkOption { + type = types.bool; + default = false; + description = '' + Request SU3 signature verification + ''; + }; + + file = mkOption { + type = types.str; + default = ""; + description = '' + Full path to SU3 file to reseed from + ''; + }; + + urls = mkOption { + type = with types; listOf str; + default = [ + "https://reseed.i2p-project.de/" + "https://i2p.mooo.com/netDb/" + "https://netdb.i2p2.no/" + "https://us.reseed.i2p2.no:444/" + "https://uk.reseed.i2p2.no:444/" + "https://i2p.manas.ca:8443/" + ]; + description = '' + Reseed URLs + ''; + }; + }; + + addressbook = { + defaulturl = mkOption { + type = types.str; + default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; + description = '' + AddressBook subscription URL for initial setup + ''; + }; + subscriptions = mkOption { + type = with types; listOf str; + default = [ + "http://inr.i2p/export/alive-hosts.txt" + "http://i2p-projekt.i2p/hosts.txt" + "http://stats.i2p/cgi-bin/newhosts.txt" + ]; + description = '' + AddressBook subscription URLs + ''; + }; + }; + + limits.transittunnels = mkOption { + type = types.int; + default = 2500; + description = '' + Maximum number of active transit sessions + ''; + }; + + proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // { + auth = mkOption { + type = types.bool; + default = false; + description = '' + Enable authentication for webconsole. + ''; + }; + user = mkOption { + type = types.str; + default = "i2pd"; + description = '' + Username for webconsole access + ''; + }; + pass = mkOption { + type = types.str; + default = "i2pd"; + description = '' + Password for webconsole access. + ''; + }; + }; + + proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 ""; + proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "") + // { + outproxy = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Upstream outproxy bind address."; + }; + outproxyPort = mkOption { + type = types.int; + default = 4444; + description = "Upstream outproxy bind port."; + }; + }; + proto.sam = mkEndpointOpt "sam" "127.0.0.1" 7656; proto.bob = mkEndpointOpt "bob" "127.0.0.1" 2827; + proto.i2cp = mkEndpointOpt "i2cp" "127.0.0.1" 7654; proto.i2pControl = mkEndpointOpt "i2pcontrol" "127.0.0.1" 7650; - proto.httpProxy = mkEndpointOpt "httpproxy" "127.0.0.1" 4446; - proto.socksProxy = mkEndpointOpt "socksproxy" "127.0.0.1" 4447; outTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; loaOf (submodule ( { name, config, ... }: { options = commonTunOpts name; config = { From bea1712727e8a818cf95178fb7b1afc202a66fed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 09:26:51 +0100 Subject: [PATCH 277/336] esniper: update to version 2.32.0 --- pkgs/applications/networking/esniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 751f6f9855b..e45d142ee46 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.31.0"; + name = "esniper-2.32.0"; src = fetchurl { url = "mirror://sourceforge/esniper/esniper-2-31-0.tgz"; From baae4be182f3aa04b0efa45e367e6753aa5c86c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 6 Nov 2016 10:02:31 +0100 Subject: [PATCH 278/336] discord: 0.0.9 -> 0.0.10 (#20184) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3a08cd26292..2ca16eb4458 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: -let version = "0.0.9"; in +let version = "0.0.10"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "72f692cea62b836220f40d81d110846f9cde9a0fba7a8d47226d89e0980255b9"; + sha256 = "1wkbbnbqbwgixdbm69dlirhgjnn8llqyzil01nqwpknh1qwd06pr"; }; libPath = stdenv.lib.makeLibraryPath [ From 4440cf6d8169e9171b87f11475a518a658fa4dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 6 Nov 2016 17:08:40 +0800 Subject: [PATCH 279/336] libgeotiff: 1.2.5 -> 1.4.2 (#20190) --- .../libraries/libgeotiff/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 01dd6b0d49e..496306c254d 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, libtiff }: +{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}: -stdenv.mkDerivation { - name = "libgeotiff-1.2.5"; +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "libgeotiff-${version}"; src = fetchurl { - url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; - sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; + url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; - buildInputs = [ libtiff ]; + configureFlags = [ + "--with-jpeg=${libjpeg.dev}" + "--with-zlib=${zlib.dev}" + ]; + buildInputs = [ libtiff proj ]; hardeningDisable = [ "format" ]; From 47d81ed3473f33cfb48f2be079f50cdfac60f1e7 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 6 Nov 2016 10:33:21 +0100 Subject: [PATCH 280/336] leaps: 0.5.1 + add a service + test --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/leaps.nix | 62 ++++++++++++++++ nixos/release.nix | 1 + nixos/tests/leaps.nix | 29 ++++++++ pkgs/development/tools/leaps/default.nix | 18 ++--- pkgs/development/tools/leaps/deps.nix | 91 ++++++++++++++++++++++-- 7 files changed, 191 insertions(+), 13 deletions(-) create mode 100644 nixos/modules/services/misc/leaps.nix create mode 100644 nixos/tests/leaps.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8c0f0c2624b..c75c22472bd 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -277,6 +277,7 @@ gitlab-runner = 257; postgrey = 258; hound = 259; + leaps = 260; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -524,6 +525,7 @@ gitlab-runner = 257; postgrey = 258; hound = 259; + leaps = 260; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 08d73970408..356cb5a92ed 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -251,6 +251,7 @@ ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/ihaskell.nix + ./services/misc/leaps.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix ./services/misc/matrix-synapse.nix diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix new file mode 100644 index 00000000000..b92cf27f58d --- /dev/null +++ b/nixos/modules/services/misc/leaps.nix @@ -0,0 +1,62 @@ +{ config, pkgs, lib, ... } @ args: + +with lib; + +let + cfg = config.services.leaps; + stateDir = "/var/lib/leaps/"; +in +{ + options = { + services.leaps = { + enable = mkEnableOption "leaps"; + port = mkOption { + type = types.int; + default = 8080; + description = "A port where leaps listens for incoming http requests"; + }; + address = mkOption { + default = ""; + type = types.str; + example = "127.0.0.1"; + description = "Hostname or IP-address to listen to. By default it will listen on all interfaces."; + }; + path = mkOption { + default = "/"; + type = types.path; + description = "Subdirectory used for reverse proxy setups"; + }; + }; + }; + + config = mkIf cfg.enable { + users = { + users.leaps = { + uid = config.ids.uids.leaps; + description = "Leaps server user"; + group = "leaps"; + home = stateDir; + createHome = true; + }; + + groups.leaps = { + gid = config.ids.gids.leaps; + }; + }; + + systemd.services.leaps = { + description = "leaps service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = "leaps"; + Group = "leaps"; + Restart = "on-failure"; + WorkingDirectory = stateDir; + PrivateTmp = true; + ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; + }; + }; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index fbd3efd16ff..639ee45b38d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -275,6 +275,7 @@ in rec { tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; + tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix new file mode 100644 index 00000000000..3c390e1a169 --- /dev/null +++ b/nixos/tests/leaps.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "leaps"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ qknight ]; + }; + + nodes = + { + client = { }; + + server = + { services.leaps = { + enable = true; + port = 6666; + path = "/leaps/"; + }; + networking.firewall.enable = false; + }; + }; + + testScript = + '' + startAll; + $server->waitForOpenPort(6666); + $client->succeed("curl http://server:6666/leaps/ | grep -i 'leaps'"); + ''; +}) diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 6db999eea54..ecc690ead05 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,26 +1,26 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "leaps-${version}"; - version = "20160626-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5cf7328a8c498041d2a887e89f22f138498f4621"; + version = "0.5.1"; goPackagePath = "github.com/jeffail/leaps"; - src = fetchgit { - inherit rev; - url = "https://github.com/jeffail/leaps"; - sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "jeffail"; + repo = "leaps"; + sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj"; + rev = "v${version}"; }; goDeps = ./deps.nix; + meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; meta.platforms = stdenv.lib.platforms.linux; - broken = true; }; } + diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index 0a6214a76d0..d611d9b4954 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,11 +1,94 @@ [ { - goPackagePath = "golang.org/x/net"; + goPackagePath = "github.com/amir/raidman"; fetch = { type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + url = "https://github.com/amir/raidman"; + rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7"; + sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2"; + sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"; + sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73"; + sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df"; + sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0"; + }; + } + { + goPackagePath = "github.com/jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/jeffail/gabs"; + rev = "ee1575a53249b51d636e62464ca43a13030afdb5"; + sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351"; + }; + } + { + goPackagePath = "github.com/jeffail/util"; + fetch = { + type = "git"; + url = "https://github.com/jeffail/util"; + rev = "48ada8ff9fcae546b5986f066720daa9033ad523"; + sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4"; + sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f9ab0dce87d815821e221626b772e3475a0d2749"; + sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; }; } ] + From 329bf83cad6c166f2d0b4c054b87a22434125e4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 10:39:40 +0100 Subject: [PATCH 281/336] esniper: update to version 2.32.0 some more --- pkgs/applications/networking/esniper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index e45d142ee46..bf6da8c207a 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "esniper-2.32.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-31-0.tgz"; - sha256 = "0xn6gdyr0c18khwcsi2brp49wkancrsrxxca7hvbawhbf263glih"; + url = "mirror://sourceforge/esniper/esniper-2-32-0.tgz"; + sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy"; }; buildInputs = [ openssl curl ]; From d9db3208890b805569a9a85fe15fff624010fa99 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 09:57:26 +0000 Subject: [PATCH 282/336] libtiff: patch for some more CVEs, fix patch urls --- .../development/libraries/libtiff/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index b632b910f01..45810283e05 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -2,6 +2,7 @@ let version = "4.0.6"; + debversion = "3"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -19,35 +20,48 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ + patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/01-CVE-2015-8665_and_CVE-2015-8683.patch"; + url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; + url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; + url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; + url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/05-CVE-2016-6223.patch"; + url = "${p}/05-CVE-2016-6223.patch"; sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/06-CVE-2016-5321.patch"; + url = "${p}/06-CVE-2016-5321.patch"; sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0"; }) (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/07-CVE-2016-5323.patch"; + url = "${p}/07-CVE-2016-5323.patch"; sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910"; }) + (fetchpatch { + url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; + sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; + }) + (fetchpatch { + url = "${p}/09-CVE-2016-5652.patch"; + sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; + }) + (fetchpatch { + url = "${p}/10-CVE-2016-3658.patch"; + sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; + }) + ]; From ac5950a4a91aa2cafd9f1cdfb772275a3de7c641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Nov 2016 11:37:47 +0100 Subject: [PATCH 283/336] libtiff: the new hashes are for fetchurl, really ... and there's not much reason to use fetchpatch in this case anyway. --- pkgs/development/libraries/libtiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 45810283e05..1911a5a93b0 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -49,15 +49,15 @@ stdenv.mkDerivation rec { url = "${p}/07-CVE-2016-5323.patch"; sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910"; }) - (fetchpatch { + (fetchurl { url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; }) - (fetchpatch { + (fetchurl { url = "${p}/09-CVE-2016-5652.patch"; sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; }) - (fetchpatch { + (fetchurl { url = "${p}/10-CVE-2016-3658.patch"; sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; }) From 20fe51661dcea78682420767fb8afd1170b06781 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 6 Nov 2016 11:42:13 +0100 Subject: [PATCH 284/336] xlaunch: remove; it was fine-tuned to an old NixOS state and such functionality is forbidden by systemd --- pkgs/tools/X11/xlaunch/default.nix | 64 ------------------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 66 deletions(-) delete mode 100644 pkgs/tools/X11/xlaunch/default.nix diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix deleted file mode 100644 index b7927ca8cb8..00000000000 --- a/pkgs/tools/X11/xlaunch/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, xorgserver }: - -# !!! What does this package do, and does it belong in Nixpkgs? - -stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include - #include - #include - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } -EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver.out}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; - meta = { - description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c20868a5503..20846fb951b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15296,8 +15296,6 @@ in xtrace = callPackage ../tools/X11/xtrace { }; - xlaunch = callPackage ../tools/X11/xlaunch { }; - xmacro = callPackage ../tools/X11/xmacro { }; xmove = callPackage ../applications/misc/xmove { }; From 80c6f9cb7812e87afda4ac70bc350c5a19fd469f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Nov 2016 11:58:05 +0100 Subject: [PATCH 285/336] pythonPackages: fix indentation, remove tabs --- pkgs/top-level/python-packages.nix | 116 ++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d21281c598..b44676c72e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2550,7 +2550,7 @@ in { sha256 = "0y0rdxbiwm03zv6vpvapqilrird3h8ijz7xmb0j7ds5j4p6q3g24"; }; - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 }; iowait = buildPythonPackage rec { @@ -11164,15 +11164,16 @@ in { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc - beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 + propagatedBuildInputs = with self; [ + paver feedparser sqlalchemy pyyaml rpyc + beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask + cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 guessit pathpy apscheduler ] - # enable deluge and transmission plugin support, if they're installed - ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) - pythonpackages.deluge - ++ stdenv.lib.optional (pkgs.transmission != null) - self.transmissionrpc; + # enable deluge and transmission plugin support, if they're installed + ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) + pythonpackages.deluge + ++ stdenv.lib.optional (pkgs.transmission != null) + self.transmissionrpc; meta = { homepage = http://flexget.com/; @@ -23141,7 +23142,7 @@ in { homepage = "http://sqlmap.org"; license = licenses.gpl2; description = "Automatic SQL injection and database takeover tool"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; }; }; @@ -25846,10 +25847,10 @@ in { mv "$wrapper" "$wrapped" cat > "$wrapper" <<- EOF - export PATH="$PATH:\$PATH" - export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" - source "$wrapped" - EOF + export PATH="$PATH:\$PATH" + export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" + source "$wrapped" + EOF chmod -x "$wrapped" chmod +x "$wrapper" @@ -28834,28 +28835,28 @@ in { ofxclient = buildPythonPackage rec { name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; + sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; + }; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; + propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; }; ofxhome = buildPythonPackage rec { - name = "ofxhome-0.3.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; - sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; - }; + name = "ofxhome-0.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; + sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; + }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose ]; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; meta = { homepage = "https://github.com/captin411/ofxhome"; @@ -28865,13 +28866,13 @@ in { }; ofxparse = buildPythonPackage rec { - name = "ofxparse-0.14"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; - sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; - }; + name = "ofxparse-0.14"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; + sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; + }; - propagatedBuildInputs = with self; [ six beautifulsoup4 ]; + propagatedBuildInputs = with self; [ six beautifulsoup4 ]; meta = { homepage = "http://sites.google.com/site/ofxparse"; @@ -30102,34 +30103,33 @@ in { }; }; - Quandl = buildPythonPackage rec { - version = "3.0.0"; - name = "Quandl-${version}"; + version = "3.0.0"; + name = "Quandl-${version}"; - src = pkgs.fetchurl { - url= "mirror://pypi/q/quandl/${name}.tar.gz"; - sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; - }; + src = pkgs.fetchurl { + url= "mirror://pypi/q/quandl/${name}.tar.gz"; + sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; + }; - propagatedBuildInputs = with self; [ - numpy - ndg-httpsclient - dateutil - inflection - more-itertools - requests2 - pandas - ]; + propagatedBuildInputs = with self; [ + numpy + ndg-httpsclient + dateutil + inflection + more-itertools + requests2 + pandas + ]; - #No tests in archive - doCheck = false; + # No tests in archive + doCheck = false; - meta = { - homepage = https://github.com/quandl/quandl-python; - description = "A Python library for Quandl’s RESTful API"; - maintainers = with maintainers; [ NikolaMandic ]; - }; + meta = { + homepage = https://github.com/quandl/quandl-python; + description = "A Python library for Quandl’s RESTful API"; + maintainers = with maintainers; [ NikolaMandic ]; + }; }; queuelib = buildPythonPackage rec { From a97db109a20697a14d3ca72a112d05cc0411ae8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 6 Nov 2016 12:20:43 +0100 Subject: [PATCH 286/336] Disabling OABI_COMPAT on ARM platforms. Otherwise, systemd-logind fails to work because SECCOMP_FILTER cannot be enabled with OABI_COMPAT set. We don't need OABI_COMPAT at all on ARM, I guess. With this change, the rpi kernel boots fine for raspberrypi2. We discussed this change with Dezgeg. --- pkgs/top-level/platforms.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 3c94501b1a5..efeae9a9d20 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -86,6 +86,10 @@ rec { ZRAM m NETCONSOLE m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n @@ -187,6 +191,10 @@ rec { ZRAM m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n @@ -268,6 +276,10 @@ rec { ZRAM m + # Disable OABI to have seccomp_filter (required for systemd) + # https://github.com/raspberrypi/firmware/issues/651 + OABI_COMPAT n + # Fail to build DRM n SCSI_ADVANSYS n From 492b2ee1d43465ceac195ae9d9d4c1b9892d789e Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 6 Nov 2016 13:09:22 +0100 Subject: [PATCH 287/336] wallabag: 2.1.2 -> 2.1.3 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 68732b2e169..9db45d6a8e1 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.2"; + version = "2.1.3"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "01i4xdzw126wwwkxy0d97dizrikvawpzqj95bykd1g25m7jzvb7k"; + sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp"; }; outputs = [ "out" "doc" ]; From f49f90bfdd58e0f02d709c028a6e33a588dd56f4 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Fri, 4 Nov 2016 15:51:05 +0100 Subject: [PATCH 288/336] volnoti: init at 2013-09-23 --- pkgs/applications/misc/volnoti/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/volnoti/default.nix diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix new file mode 100644 index 00000000000..836deb656a2 --- /dev/null +++ b/pkgs/applications/misc/volnoti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg +, dbus_glib, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "volnoti-unstable-${version}"; + version = "2013-09-23"; + + src = fetchFromGitHub { + owner = "davidbrazdil"; + repo = "volnoti"; + rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24"; + sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7"; + }; + + patches = [ + # Fix dbus interface headers. See + # https://github.com/davidbrazdil/volnoti/pull/10 + (fetchpatch { + url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; + }) + ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + + buildInputs = [ + dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + ]; + + meta = with stdenv.lib; { + description = "Lightweight volume notification for Linux"; + homepage = "https://github.com/davidbrazdil/volnoti"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.gilligan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20846fb951b..082b2f5e89d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14964,6 +14964,8 @@ in VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; + volnoti = callPackage ../applications/misc/volnoti { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; vscode = callPackage ../applications/editors/vscode { }; From ae5d404509ad57b4a739b02eb7fdd0c7eb288b88 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Nov 2016 13:46:40 +0100 Subject: [PATCH 289/336] lttng-modules: 2.8.0 -> 2.8.3 Fixes build against linux >=4.8 Full changelog at https://git.lttng.org/?p=lttng-tools.git;a=blob_plain;f=ChangeLog;hb=13dc409a5ea439b96b805c3c71886a3fcfad18e8 Tested with nix-build -A linuxPackages.lttng-modules -A linuxPackages_latest.lttng-modules --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 083362489ad..7e29aa0f67d 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.8.0"; + version = "2.8.3"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0a9xwq0kgpx1y800l232h524f19g3py6cnxff10j9p01q6lzhrxh"; + sha256 = "018lqxbksj9hpjfp2a3yc6lkjkj4rgf2x147l1jjh7mfgqvcb53b"; }; hardeningDisable = [ "pic" ]; From 2fcbe451f248ade39084c831c6b5bb6498bffce0 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 6 Nov 2016 17:29:15 +0100 Subject: [PATCH 290/336] youtube-dl: add optional support for RTMP --- pkgs/tools/misc/youtube-dl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 21828f2c278..d1ba3ced99b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, pandoc +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc , atomicparsley # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -7,6 +7,7 @@ # included. , generateManPage ? false , ffmpegSupport ? true +, rtmpSupport ? true }: with stdenv.lib; @@ -24,9 +25,10 @@ buildPythonApplication rec { buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. + # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails postInstall = let - packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg; + packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}" ''; From 184aefa3c48826038c9c618487f62ccf127b54c9 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 5 Nov 2016 17:14:41 +0100 Subject: [PATCH 291/336] rtags: fix darwin build Adds dependency to MacOS_SDK 10.9 and accordingly to the macosx deployment target to configure SDK-based deployment in rtags. In detail, rtags makes use of launch_activate_socket() which is available in launchd.h >10.9. Latter is still not available through apple-opensource-releases, if ever. Thus, the deployment target and build input have to be added to let rtags build scripts make use of MAC_OS_X_VERSION_MAX_ALLOWED correctly. --- pkgs/development/tools/rtags/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 959681c7e1a..e0475bdad76 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }: stdenv.mkDerivation rec { name = "rtags-${version}"; version = "2.3"; - buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]; + buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] + ++ lib.optional stdenv.isDarwin apple_sdk.sdk; preConfigure = '' - export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ + + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ + + '' + lib.optionalString stdenv.isDarwin '' + export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \ + MACOSX_DEPLOYMENT_TARGET="10.9" ''; src = fetchgit { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38f1c00ffb..db1ef6faca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5130,7 +5130,9 @@ in rgbds = callPackage ../development/compilers/rgbds { }; - rtags = callPackage ../development/tools/rtags/default.nix {}; + rtags = callPackage ../development/tools/rtags/default.nix { + inherit (darwin) apple_sdk; + }; rust = rustStable; rustStable = callPackage ../development/compilers/rust {}; From a9428f0c42dafeff0d669055c67e6ca1d528e9ee Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sun, 6 Nov 2016 18:55:43 +0100 Subject: [PATCH 292/336] Fix breaking empty line --- pkgs/development/tools/rtags/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index e0475bdad76..f8f9646182b 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { preConfigure = '' export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ '' + lib.optionalString stdenv.isDarwin '' From 83f28fdd73cd7af05bbbe90531e4623c3305afb0 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 6 Nov 2016 21:42:54 +0100 Subject: [PATCH 293/336] libtiff: `fetchpatch` -> `fetchurl` See #20206. vcunat doesn't consider this important, but it is perhaps nicer and now is a moment we can afford to rehash. --- .../development/libraries/libtiff/default.nix | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 1911a5a93b0..394e6c2c170 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -21,33 +21,33 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ - (fetchpatch { + (fetchurl { url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; - sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc"; + sha256 = "0qiiqpbbsf01b59x01z38cg14pmg1ggcsqm9n1gsld6rr5wm3ryz"; }) - (fetchpatch { + (fetchurl { url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; - sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv"; + sha256 = "1ph057w302i2s94rhdw6ksyvpsmg1nlanvc0251x01s23gkdbakv"; }) - (fetchpatch { + (fetchurl { url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; - sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a"; + sha256 = "1nhjg2gdvyzi4wa2g7nwmzm7nssz9dpdfkwms1rp8i1034qdlgc6"; }) - (fetchpatch { + (fetchurl { url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; - sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8"; + sha256 = "0n47yk9wcvc9j72yvm5bhpaqq0yfz8jnq9zxbnzx5id9gdxmrkn3"; }) - (fetchpatch { + (fetchurl { url = "${p}/05-CVE-2016-6223.patch"; - sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1"; + sha256 = "0r80hil9k6scdjppgyljhm0s2z6c8cm259f0ic0xvxidfaim6g2r"; }) - (fetchpatch { + (fetchurl { url = "${p}/06-CVE-2016-5321.patch"; - sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0"; + sha256 = "1aacymlqv6cam8i4nbma9v05r3v3xjpagns7q0ii268h0mhzq6qg"; }) - (fetchpatch { + (fetchurl { url = "${p}/07-CVE-2016-5323.patch"; - sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910"; + sha256 = "1xr5hy2fxa71j3fcc1l998pxyblv207ygzyhibwb1lia5zjgblch"; }) (fetchurl { url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { url = "${p}/10-CVE-2016-3658.patch"; sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; }) - - ]; doCheck = true; From b1df5bf89b641f4e7f7538e460df69ee177dfa7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 6 Nov 2016 22:50:41 +0100 Subject: [PATCH 294/336] gstreamer: unbreak finding plugins in $NIX_PROFILES (#20207) * gstreamer-1.0: make gst-launch find plugins again gst-launch and friends are in the "dev" output now. * gstreamer-1.0: lower priority on plugins from $NIX_PROFILES Suffix the plugin paths from $NIX_PROFILES instead of prefixing them to $GST_PLUGIN_SYSTEM_PATH. If a program has specifically set up its plugin path to some custom/specific version, we don't want plugins from $NIX_PROFILES to mess things up by having higher priority. --- pkgs/development/libraries/gstreamer/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index da15755355d..da6a8c7a74a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + for prog in "$dev/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; From 91d6779b96999b0919448b93715445c4a3a85f16 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 7 Nov 2016 00:20:32 +0100 Subject: [PATCH 295/336] =?UTF-8?q?octave:=204.0.1=20=E2=86=92=204.0.3=20(?= =?UTF-8?q?+=20portaudio=20dep)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/interpreters/octave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index df443cdc3e1..226f819ded9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -18,16 +18,16 @@ let in stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.xz"; - sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym"; + sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw - fftwSinglePrec qrupdate arpack libwebp ] + fftwSinglePrec portaudio qrupdate arpack libwebp ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) From 0e78ed82bfe660ac3ef7ff343527dc47d9536468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 7 Nov 2016 00:50:42 +0100 Subject: [PATCH 296/336] dirb: init at 2.22 --- pkgs/tools/networking/dirb/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/dirb/default.nix diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix new file mode 100644 index 00000000000..abb64d4d896 --- /dev/null +++ b/pkgs/tools/networking/dirb/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, automake, autoconf, curl, autoreconfHook }: + +let + major = "2"; + minor = "22"; +in stdenv.mkDerivation rec { + name = "dirb-${version}"; + version = "${major}.${minor}"; + src = fetchurl { + url = "mirror://sourceforge/dirb/${version}/dirb${major}${minor}.tar.gz"; + sha256 = "0b7wc2gvgnyp54rxf1n9arn6ymrvdb633v6b3ah138hw4gg8lx7k"; + }; + + unpackPhase = '' + tar -xf $src + find . -exec chmod +x "{}" ";" + export sourceRoot="dirb222" + ''; + + buildInputs = [ automake autoconf curl ]; + preConfigure = "chmod +x configure"; + + meta = { + description = "A web content scanner"; + homepage = "http://dirb.sourceforge.net/"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = with stdenv.lib.licenses; [ gpl2 ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38f1c00ffb..80b7aa702a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -790,6 +790,8 @@ in aspellDicts_en = aspellDicts.en; }; + dirb = callPackage ../tools/networking/dirb { }; + direnv = callPackage ../tools/misc/direnv { }; discount = callPackage ../tools/text/discount { }; From 897a1ba8ff666b51e30e299cf67a57bcf2efb30a Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Mon, 7 Nov 2016 06:56:15 +0100 Subject: [PATCH 297/336] neomutt: 20160910 -> 20161104 (#20221) --- .../applications/networking/mailreaders/neomutt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e3cbd17e267..2033dfc8e91 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160910"; + version = "20161104"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; + sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw"; }; buildInputs = @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan vrthra ]; + maintainers = with maintainers; [ cstrahan vrthra erikryb ]; }; } From b69ef90fe7b05167dfa3ac6c7f29667fbdf3a9a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 19:02:52 +0100 Subject: [PATCH 298/336] Update to LTS Haskell 7.8. --- .../configuration-hackage2nix.yaml | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e135987a4cf..37b050d05d4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.7 + # LTS Haskell 7.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -254,11 +254,11 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - - Cabal ==1.24.0.0 + - Cabal ==1.24.1.0 - cabal-dependency-licenses ==0.1.2.0 - cabal-file-th ==0.2.3 - cabal-helper ==0.7.2.0 - - cabal-install ==1.24.0.0 + - cabal-install ==1.24.0.1 - cabal-rpm ==0.10.0 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.2 @@ -276,9 +276,10 @@ default-package-overrides: - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.0.0 + - cayley-client ==0.2.1.0 - cereal ==0.5.3.0 - cereal-conduit ==0.7.3 + - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - cgi ==3001.3.0.1 - ChannelT ==0.0.0.2 @@ -448,7 +449,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.17 + - direct-sqlite ==2.3.18 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -472,7 +473,7 @@ default-package-overrides: - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.1.0 - - download ==0.3.2.4 + - download ==0.3.2.5 - dpor ==0.2.0.0 - drawille ==0.1.0.6 - DRBG ==0.5.5 @@ -579,7 +580,7 @@ default-package-overrides: - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 - foreign-store ==0.2 - - formatting ==6.2.2 + - formatting ==6.2.3 - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 @@ -643,7 +644,7 @@ default-package-overrides: - gitrev ==1.2.0 - gitson ==0.5.2 - gl ==0.7.8.1 - - glabrous ==0.1.2.0 + - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - Glob ==0.7.12 @@ -749,7 +750,7 @@ default-package-overrides: - gogol-youtube-analytics ==0.1.0 - gogol-youtube-reporting ==0.1.0 - google-cloud ==0.0.4 - - google-oauth2-jwt ==0.1.2.0 + - google-oauth2-jwt ==0.1.2.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -854,8 +855,8 @@ default-package-overrides: - hlint ==1.9.35 - hmatrix ==0.17.0.2 - hmatrix-gsl ==0.17.0.0 - - hmatrix-gsl-stats ==0.4.1.3 - - hmatrix-special ==0.4.0.0 + - hmatrix-gsl-stats ==0.4.1.4 + - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.2 - hmt ==0.15 - hoauth2 ==0.5.4.0 @@ -1497,7 +1498,7 @@ default-package-overrides: - s3-signer ==0.3.0.0 - safe ==0.3.9 - safe-exceptions ==0.1.4.0 - - safecopy ==0.9.1 + - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - sampling ==0.2.0 - sandi ==0.4.0 @@ -1611,7 +1612,7 @@ default-package-overrides: - sql-words ==0.1.4.1 - sqlite-simple ==0.4.9.0 - srcloc ==0.5.1.0 - - stache ==0.1.7 + - stache ==0.1.8 - stack-run-auto ==0.1.1.4 - stackage-curator ==0.14.1.1 - stackage-types ==1.2.0 @@ -1628,7 +1629,7 @@ default-package-overrides: - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - stm-stats ==0.2.0.0 - - STMonadTrans ==0.3.3 + - STMonadTrans ==0.3.4 - stopwatch ==0.1.0.3 - storable-complex ==0.2.2 - storable-endian ==0.2.5 @@ -1891,7 +1892,7 @@ default-package-overrides: - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.10 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.5 + - web-routes-th ==0.22.6 - web-routes-wai ==0.24.3 - webdriver ==0.8.4 - webdriver-angular ==0.1.11 @@ -1975,7 +1976,7 @@ default-package-overrides: - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.0.6 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.0.5 + - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - yesod-test ==1.5.3 From cefc24bf69694a9b765aed5275b0e1c082c8d294 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2016 23:36:48 +0100 Subject: [PATCH 299/336] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d2b9c38a115e41748a73a00bd866504090a2c4cb. --- .../haskell-modules/hackage-packages.nix | 528 +++++++++--------- 1 file changed, 272 insertions(+), 256 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e45070068ee..d1a08377698 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2308,7 +2308,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_24_0_0" = callPackage + "Cabal_1_24_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit @@ -2316,8 +2316,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.24.0.0"; - sha256 = "c00e9d372adb49ce1bd5b62ff049cf49adc4a312a271b238894e50eb707297aa"; + version = "1.24.1.0"; + sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -6723,8 +6723,8 @@ self: { }: mkDerivation { pname = "HDBC-mysql"; - version = "0.7.0.0"; - sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4"; + version = "0.7.1.0"; + sha256 = "81c985d4a243c965930fb412b3175ca799ba66985f8b6844014fd600df1da7cf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; librarySystemDepends = [ mysqlclient openssl zlib ]; @@ -10953,6 +10953,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MBot" = callPackage + ({ mkDerivation, base, bytestring, hidapi, mtl }: + mkDerivation { + pname = "MBot"; + version = "0.1.0.2"; + sha256 = "147655ce2a168c963fa04130b0f6196cb3679dbc8512d04dbff3c12406d16ec2"; + libraryHaskellDepends = [ base bytestring hidapi mtl ]; + description = "Haskell interface for controlling the mBot educational robot"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "MC-Fold-DP" = callPackage ({ mkDerivation, base, Biobase, cmdargs, PrimitiveArray, split , tuple, vector @@ -14866,12 +14877,13 @@ self: { }) {}; "STMonadTrans" = callPackage - ({ mkDerivation, array, base, mtl }: + ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.3"; - sha256 = "d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315"; + version = "0.3.4"; + sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210"; libraryHaskellDepends = [ array base mtl ]; + testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17488,6 +17500,25 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32_2_4_0_0" = callPackage + ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 + , shfolder, shlwapi, user32, winmm + }: + mkDerivation { + pname = "Win32"; + version = "2.4.0.0"; + sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ + advapi32 gdi32 shell32 shfolder shlwapi user32 winmm + ]; + homepage = "https://github.com/haskell/win32"; + description = "A binding to part of the Win32 library"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {advapi32 = null; gdi32 = null; shell32 = null; + shfolder = null; shlwapi = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { @@ -30308,21 +30339,21 @@ self: { }) {}; "bibdb" = callPackage - ({ mkDerivation, alex, array, base, bibtex, bytestring, containers - , curl, download-curl, filepath, happy, microlens, microlens-mtl - , microlens-th, mtl, optparse-applicative, parsec, pretty - , transformers + ({ mkDerivation, alex, array, async, base, bibtex, bytestring + , containers, curl, download-curl, filepath, happy, microlens + , microlens-mtl, microlens-th, mtl, optparse-applicative, parsec + , pretty, transformers }: mkDerivation { pname = "bibdb"; - version = "0.4.2"; - sha256 = "6f741fe0e4b1adacee03f7ca2a71c5727709e105dee5a67431b2c298233ca446"; + version = "0.5.2"; + sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bibtex bytestring containers curl download-curl filepath - microlens microlens-mtl microlens-th mtl optparse-applicative - parsec pretty transformers + array async base bibtex bytestring containers curl download-curl + filepath microlens microlens-mtl microlens-th mtl + optparse-applicative parsec pretty transformers ]; executableToolDepends = [ alex happy ]; homepage = "https://github.com/cacay/bibdb"; @@ -35841,10 +35872,10 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.0"; - sha256 = "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e"; + version = "1.24.0.1"; + sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc"; revision = "1"; - editedCabalFile = "375b1a073b68c5531b11f70cdcf55a9add6f8337d9ff0c850c1da7e7bf7bbf39"; + editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38095,27 +38126,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.2.0.0"; - sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_2_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -40272,6 +40282,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clay_0_12" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.12"; + sha256 = "7bef7e086e7e3cd9f35c2e9b8ea7f6e7428e65090ea824cf680c645a350825e9"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-expectations mtl text ]; + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath @@ -45237,8 +45261,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.5.0.0"; - sha256 = "22a3fbe663b18effaff54269d16e76aa9513d8a00d4773c3f5555d1a2f5d1567"; + version = "0.5.0.2"; + sha256 = "f39aa34ede9d79444fd6b4d8a3ca492bdce1b16054df5fa11b76acdb7eb81616"; libraryHaskellDepends = [ base containers hashable mtl primitive transformers unordered-containers vector @@ -53395,23 +53419,6 @@ self: { }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.17"; - sha256 = "fade7c52d157cf145380a4818fa2e03163fa104fadf43d580c1d475b6b6fffc4"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - homepage = "https://github.com/IreneKnapp/direct-sqlite"; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_18" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, temporary, text }: @@ -53426,7 +53433,6 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -55110,20 +55116,6 @@ self: { }) {}; "download" = callPackage - ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: - mkDerivation { - pname = "download"; - version = "0.3.2.4"; - sha256 = "f8ef9cca18a4829ab640c6f00ed7e707e29e0ed40bc662dfaa1ef42d7ee358bc"; - libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/psibi/download"; - description = "High-level file download based on URLs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "download_0_3_2_5" = callPackage ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; @@ -56916,22 +56908,23 @@ self: { ({ mkDerivation, array, base, containers, directory, filepath, ghc , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random , regex-tdfa, test-framework, test-framework-hunit, text - , transformers, unordered-containers + , transformers, unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.6.0"; - sha256 = "16ef278a19fdd9bbc7d58fa8864049b17c47f6ad236e020d00927467726833b2"; + version = "3.6.1"; + sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths haskeline mtl parsec process random regex-tdfa text transformers unordered-containers + vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline mtl parsec process regex-tdfa text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ base Glob HUnit mtl test-framework test-framework-hunit @@ -64131,21 +64124,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, base, clock, old-locale, scientific, text - , text-format, time - }: - mkDerivation { - pname = "formatting"; - version = "6.2.2"; - sha256 = "4fdcd7e30c48e67e64be04bbf4fc315996898aba9fcdb2491f4bcd3f3fba3412"; - libraryHaskellDepends = [ - base clock old-locale scientific text text-format time - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "formatting_6_2_3" = callPackage ({ mkDerivation, base, clock, old-locale, scientific, text , text-format, time }: @@ -64158,7 +64136,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forml" = callPackage @@ -70546,26 +70523,6 @@ self: { }) {}; "glabrous" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , directory, either, hspec, text, unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "0.1.2.0"; - sha256 = "ae66cf3c83a8da0095715aee111cd6e834c37501128e39adfb0e0eb2a90a70ad"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring either text - unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_1_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers @@ -70584,7 +70541,6 @@ self: { homepage = "https://github.com/MichelBoucey/glabrous"; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -74242,23 +74198,6 @@ self: { }) {}; "google-oauth2-jwt" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL - , RSA, text, unix-time - }: - mkDerivation { - pname = "google-oauth2-jwt"; - version = "0.1.2.0"; - sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; - libraryHaskellDepends = [ - base base64-bytestring bytestring HsOpenSSL RSA text unix-time - ]; - homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; - description = "Get a signed JWT for Google Service Accounts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "google-oauth2-jwt_0_1_2_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL , RSA, text, unix-time }: @@ -88528,8 +88467,8 @@ self: { }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.4.1.3"; - sha256 = "d4852352ed9b5ee4b8e7f519d512047e5976804563151c3bd092589248fc7738"; + version = "0.4.1.4"; + sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa"; libraryHaskellDepends = [ base binary hmatrix storable-complex vector ]; @@ -88592,19 +88531,6 @@ self: { }) {}; "hmatrix-special" = callPackage - ({ mkDerivation, base, hmatrix, hmatrix-gsl }: - mkDerivation { - pname = "hmatrix-special"; - version = "0.4.0.0"; - sha256 = "1fba0cc75e22df1655ac5771180b26f8ce706783363c825aa6fac8cff5f02933"; - libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Interface to GSL special functions"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hmatrix-special_0_4_0_1" = callPackage ({ mkDerivation, base, hmatrix, hmatrix-gsl }: mkDerivation { pname = "hmatrix-special"; @@ -95330,6 +95256,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htoml_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml"; + version = "1.0.0.3"; + sha256 = "08f8d88a326f80fb55c0abb9431941c3a2a30f2d58f49c94349961ceeb4c856f"; + libraryHaskellDepends = [ + aeson base containers old-locale parsec text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed parsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + homepage = "https://github.com/cies/htoml"; + description = "Parser for TOML files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -95519,7 +95468,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_3" = callPackage + "http-client_0_5_3_4" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95528,8 +95477,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.3"; - sha256 = "8faeb55e45f578c9aa7a17dab5a6cb4aa858fb8d64a18c18497c3af4569164ce"; + version = "0.5.3.4"; + sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -100940,6 +100889,8 @@ self: { pname = "instant-generics"; version = "0.6"; sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15"; + revision = "1"; + editedCabalFile = "1c1174f7546fceb789fcc40882eb731a21cb88165dac4e59129ff2ec1a11a2fc"; libraryHaskellDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -107758,6 +107709,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_6_0_9" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.9"; + sha256 = "a86b98d4fb8c27bbe54f7bedecde2acfea7e7d8e30a55434fd971b15238932cc"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + homepage = "https://github.com/erikd/language-javascript"; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-kort" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck , random, razom-text-util, regex-applicative, smaoin, text @@ -110660,8 +110634,8 @@ self: { ({ mkDerivation, base, NumInstances, vector }: mkDerivation { pname = "lin-alg"; - version = "0.1.0.2"; - sha256 = "0cdf23a797b4e11be1a2b5c6b7c6228a6372b7ad2930e36b3214d763d21c22a4"; + version = "0.1.0.3"; + sha256 = "3e9622c7353f03d6a097ec4d12a5ba571d5c580811293c72ec8088434315dc79"; libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; @@ -113247,6 +113221,8 @@ self: { pname = "lowgl"; version = "0.3.1.1"; sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; + revision = "1"; + editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591"; libraryHaskellDepends = [ base data-default gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; @@ -117314,6 +117290,8 @@ self: { pname = "mikmod"; version = "0.2.0.1"; sha256 = "b7d2b0aa2288f5874aad326043676f667bc61e930d0a5e9c5a90243807e023ed"; + revision = "1"; + editedCabalFile = "6b9bdb1899839287cfa2e355f5836d9d36a8f84a2adce83ec34aef2e6ad3d22a"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; @@ -120895,15 +120873,18 @@ self: { }) {}; "multifile" = callPackage - ({ mkDerivation, base, directory, HaXml, pretty, transformers }: + ({ mkDerivation, base, directory, HaXml, optparse-applicative + , pretty, process, transformers + }: mkDerivation { pname = "multifile"; - version = "0.1.0.3"; - sha256 = "f02f1c4fda7708c064735f7b5c5b8fec59c27522c0fce1c057c3705d9e70a322"; + version = "0.1.0.4"; + sha256 = "0c6224001af91ba477e08c774212ae48fd94cdc86666b2a686fe414ee8ac4973"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory HaXml pretty transformers + base directory HaXml optparse-applicative pretty process + transformers ]; homepage = "xy30.com"; description = "create many files from one"; @@ -121021,6 +121002,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multipath" = callPackage + ({ mkDerivation, base, parsec, utf8-string }: + mkDerivation { + pname = "multipath"; + version = "0.1.0.0"; + sha256 = "c33ea7b02ac8a409826b05900c103e2bdaffc0187808f93b0eafac180bac9c54"; + libraryHaskellDepends = [ base parsec utf8-string ]; + homepage = "https://github.com/SupraSummus/haskell-multipath"; + description = "Parser and builder for unix-path-like objects"; + license = stdenv.lib.licenses.mit; + }) {}; + "multiplate" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -124439,8 +124432,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.3.1"; - sha256 = "2c5b5a6199e6eb4e11fc25cf92663bfaed323f44d34f05991ede25429e8b322c"; + version = "0.2.4.0"; + sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -138162,8 +138155,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.2"; - sha256 = "91247ef3eb722e917e5ec4b078b66ff3be0dee41848694ae644799d0d8e97b5f"; + version = "0.3.3"; + sha256 = "2b8b6db68f0cb2987d1804537f7b81523af0a357ea3a08a940302120804ede9b"; libraryHaskellDepends = [ base bytestring data-default-class template-haskell ]; @@ -140905,6 +140898,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rating-systems" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rating-systems"; + version = "0.1"; + sha256 = "099c4472a4251af6ac01c77535d05ac85ef25512206fb0f46971a7023776b89e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mightybyte/rating-systems"; + description = "Implementations of several rating systems: Elo, Glicko, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ratio-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -140920,18 +140925,18 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, regex-compat, tasty, tasty-hspec - , template-haskell, text, vector + , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , vector }: mkDerivation { pname = "rattletrap"; - version = "0.1.6"; - sha256 = "a1578ce6b94f5b2ad92eb2873fab947918a466f4c34e5a1e659ac15fe18a733d"; + version = "0.2.0"; + sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap binary binary-bits bytestring containers - data-binary-ieee754 regex-compat text vector + data-binary-ieee754 text vector ]; executableHaskellDepends = [ aeson aeson-casing base binary bytestring template-haskell @@ -142800,6 +142805,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-do" = callPackage + ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + , regex-base, regex-pcre, stringsearch, text + }: + mkDerivation { + pname = "regex-do"; + version = "1.1"; + sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc"; + revision = "1"; + editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77"; + libraryHaskellDepends = [ + array base bytestring regex-base regex-pcre stringsearch text + ]; + testHaskellDepends = [ + array base bytestring hspec QuickCheck regex-base regex-pcre + stringsearch text + ]; + homepage = "https://github.com/ciez/regex-do"; + description = "PCRE regex wrapper functions"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "regex-easy" = callPackage ({ mkDerivation, array, base, bytestring, regex-pcre , string-conversions @@ -143288,6 +143315,8 @@ self: { pname = "regular"; version = "0.3.4.4"; sha256 = "85f22409b4a5413a7180286caada7375deca4d16010f4681fe343175841c5684"; + revision = "1"; + editedCabalFile = "3ce38f1af2edc138b690a138e776637e5fd1ede9ee5151a31c4be77a73133943"; libraryHaskellDepends = [ base template-haskell ]; description = "Generic programming library for regular datatypes"; license = stdenv.lib.licenses.bsd3; @@ -143376,8 +143405,8 @@ self: { }: mkDerivation { pname = "rei"; - version = "0.3.7"; - sha256 = "97577658fa9d9801ae3dda8ef3b75e8f59bae547b6dc7e91003381fc639d3e0c"; + version = "0.4.0.1"; + sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147013,29 +147042,6 @@ self: { }) {}; "safecopy" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers, lens - , lens-action, old-time, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, template-haskell, text, time, vector - }: - mkDerivation { - pname = "safecopy"; - version = "0.9.1"; - sha256 = "f480750c1d970c339a0c432ef216b3fff28c15b35b021192cc221f2a5df6dd6b"; - libraryHaskellDepends = [ - array base bytestring cereal containers old-time template-haskell - text time vector - ]; - testHaskellDepends = [ - array base cereal containers lens lens-action QuickCheck - quickcheck-instances tasty tasty-quickcheck template-haskell time - vector - ]; - homepage = "http://acid-state.seize.it/safecopy"; - description = "Binary serialization with version control"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "safecopy_0_9_2" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, template-haskell, text, time, vector @@ -147056,7 +147062,6 @@ self: { homepage = "https://github.com/acid-state/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safeint" = callPackage @@ -154151,6 +154156,8 @@ self: { pname = "siphash"; version = "1.0.3"; sha256 = "cf81ce41c6ca40c4fec9add5dcebc161cb2d31f522f9ad727df23d30ac6a05f3"; + revision = "1"; + editedCabalFile = "d629325f124617deeb6f1b172c8cbb30556090b32f3533cf8ea93ecb3df04de0"; libraryHaskellDepends = [ base bytestring cpu ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -157332,16 +157339,16 @@ self: { "sparse-linear-algebra" = callPackage ({ mkDerivation, base, containers, criterion, hspec, mtl - , mwc-random, primitive, QuickCheck + , mwc-random, primitive, QuickCheck, vector }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.1.0"; - sha256 = "83e00cc3e244cea190c407b88660427ffe2019175d1b5aade1dbfb6c0e0ffaa7"; + version = "0.2.1.1"; + sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hspec mtl mwc-random primitive QuickCheck + base containers hspec mtl mwc-random primitive QuickCheck vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -158594,30 +158601,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.1.7"; - sha256 = "3c34eec3b6b8cfc1b3c5887ab2b209e277938e897c7b3787c3baf9f7a9d0ae30"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_0_1_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -158639,7 +158622,6 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -161381,6 +161363,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stt" = callPackage + ({ mkDerivation, base, mtl, primitive, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stt"; + version = "0.2.1"; + sha256 = "dbb5d53d9486c9375c52cbe9a3d3d53f52d9ed882cecc31b5564be9dddb5b176"; + libraryHaskellDepends = [ base mtl primitive ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck transformers + ]; + description = "A monad transformer version of the ST monad"; + license = stdenv.lib.licenses.mit; + }) {}; + "stunclient" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, cryptohash , cryptohash-cryptoapi, digest, network, QuickCheck, random @@ -167911,13 +167909,14 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, dbus, directory, filepath, gi-gdk, gi-gio, gi-glib , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens - , mime-types, mtl, network, process, random, split, text - , transformers, utf8-string, xdg-basedir, xmonad, xmonad-contrib + , mime-types, mtl, network, process, random, scientific, split + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib }: mkDerivation { pname = "tianbar"; - version = "1.1.1.1"; - sha256 = "0cc35cd49ab80f083091dc085e942e1b3b0c5bf37aeab54e402b9dbc6aff9927"; + version = "1.2.0.0"; + sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167926,10 +167925,17 @@ self: { executableHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens - mime-types mtl network process random split text transformers - utf8-string xdg-basedir + mime-types mtl network process random scientific split text + transformers unordered-containers utf8-string vector xdg-basedir ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + aeson base bytestring containers dbus directory filepath gi-gdk + gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens + mime-types mtl network process random scientific split tasty + tasty-quickcheck text transformers unordered-containers utf8-string + vector xdg-basedir + ]; homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; @@ -171010,6 +171016,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tw" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "tw"; + version = "0.1.0.0"; + sha256 = "032194b50fe6b6e53c591df2e58c416244f21a59e5d699724e7ec9f4ce2a2511"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/lovasko/tw"; + description = "Trailing Whitespace"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tweak" = callPackage ({ mkDerivation, base, containers, lens, stm, transformers }: mkDerivation { @@ -171824,6 +171844,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-level-kv-list" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "1.1.0"; + sha256 = "4ff032e59108edc7dd27309ac0ee8987cc41ffba695d9699700bd37c6e7f7d73"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/type-level-kv-list#readme"; + description = "A module for hash map like object with type level keys"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-level-natural-number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -179053,22 +179086,6 @@ self: { }) {}; "web-routes-th" = callPackage - ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split - , template-haskell, text, web-routes - }: - mkDerivation { - pname = "web-routes-th"; - version = "0.22.5"; - sha256 = "1a4d3d51e67abb9c0906fbc586c2f8fa1fc2e251e944eb918ba38dd6796b3355"; - libraryHaskellDepends = [ - base parsec split template-haskell text web-routes - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; - description = "Support for deriving PathInfo using Template Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "web-routes-th_0_22_6" = callPackage ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split , template-haskell, text, web-routes }: @@ -179083,7 +179100,6 @@ self: { homepage = "https://github.com/happstack/web-routes-th"; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-routes-transformers" = callPackage @@ -185317,29 +185333,29 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, file-embed, filepath, hashable, hjsmin - , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test + , data-default, directory, exceptions, file-embed, filepath + , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time + , process, resourcet, template-haskell, text, transformers + , unix-compat, unordered-containers, wai, wai-app-static, wai-extra + , yesod-core, yesod-test }: mkDerivation { pname = "yesod-static"; - version = "1.5.0.5"; - sha256 = "3cf3f0a1da82caf974343fe03c8efa7794f56d13c6747846fa746f16b029f459"; + version = "1.5.1.1"; + sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; libraryHaskellDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory file-embed - filepath hashable hjsmin http-types mime-types old-time process - resourcet template-haskell text transformers unix-compat + cryptohash-conduit css-text data-default directory exceptions + file-embed filepath hashable hjsmin http-types mime-types old-time + process resourcet template-haskell text transformers unix-compat unordered-containers wai wai-app-static yesod-core ]; testHaskellDepends = [ async base base64-bytestring byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit data-default - directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet template-haskell text + directory exceptions file-embed filepath hjsmin hspec http-types + HUnit mime-types old-time process resourcet template-haskell text transformers unix-compat unordered-containers wai wai-app-static wai-extra yesod-core yesod-test ]; From 5dd3c227170fc61a8c1fe7ef84975c026a6c81c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 03:34:46 +0100 Subject: [PATCH 300/336] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/17853c139c92a382d06780efc983a47c5d372c96. --- .../haskell-modules/hackage-packages.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d1a08377698..45839074b79 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62996,20 +62996,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_1_1" = callPackage - ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras - , mwc-probability, pipes, primitive, transformers, vector + "flat-mcmc_1_2_2" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.1.1"; - sha256 = "24e2bc1b4728dd54326908332322f227cc2bf3548e6e1b07f0695a1c3167a88c"; + version = "1.2.2"; + sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937"; libraryHaskellDepends = [ - base mcmc-types monad-par monad-par-extras mwc-probability pipes - primitive transformers vector + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector ]; testHaskellDepends = [ base vector ]; - homepage = "http://jtobin.github.com/flat-mcmc"; + homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; From d9c3f3fbaf81193ecddf107fe6efd91cc3e600d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Nov 2016 14:09:35 +0100 Subject: [PATCH 301/336] haskell-Cabal: update from 1.24.0.0 to 1.24.1.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82073ff0989..aaa615f4caa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -5,7 +5,7 @@ with import ./lib.nix { inherit pkgs; }; self: super: { # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 95629c37532..9710d139f8a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; From 488e460f27cbea516ba866ed5ea5320804642d73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2016 10:28:06 +0100 Subject: [PATCH 302/336] configuration-common.nix: update reference to http-client_0_5_3_4 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aaa615f4caa..02b20ccd75c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -974,7 +974,7 @@ self: super: { # https://github.com/commercialhaskell/stack/issues/2263 stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_3_3; + http-client = self.http-client_0_5_3_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; From d268cef94abd4a610d039232877046fa5baabcf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 08:25:33 +0100 Subject: [PATCH 303/336] haskell-distributed-process-tests: don't run tests on Hydra --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02b20ccd75c..4f93b2f857c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1068,4 +1068,7 @@ self: super: { # http://hydra.cryp.to/build/498404/log/raw dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch); + # Test suite occasionally runs for 1+ days on Hydra. + distributed-process-tests = dontCheck super.distributed-process-tests; + } From c92a549f6ccf0cc128a563d597bfb8175c8ed068 Mon Sep 17 00:00:00 2001 From: Luis Pedro Coelho Date: Mon, 7 Nov 2016 08:38:20 +0100 Subject: [PATCH 304/336] pythonPackages.jug: 1.2.2 -> 1.3.0 Update jug to newest release. --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44676c72e4..95bd6b4d1fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7609,25 +7609,27 @@ in { }; jug = buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ + bottle pyyaml redis six + pkgs.zlib ]; src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "1riski56b93i8fddgixmmrh6cbprwv44r5wnzcqg9khky1wkg4ls"; + sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl"; }; meta = { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - url = https://jug.readthedocs.org/; + url = https://jug.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; }; }; From ab21519858dabc9a1b841ccdd4bc80a40250098a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 7 Nov 2016 11:02:37 +0300 Subject: [PATCH 305/336] bumblebee: use fetchpatch for GitHub patches --- pkgs/tools/X11/bumblebee/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 116a7a014ea..0429faab2ef 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib @@ -49,13 +49,13 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); - modprobePatch = fetchurl { + modprobePatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; - sha256 = "0x9qvhw6sn606dqcp3394irj6jjhw3h75k3lpbys6gha1yshgjps"; + sha256 = "02vq3vba6nx7gglpjdfchws9vjhs1x02a543yvqrxqpvvdfim2x2"; }; - libkmodPatch = fetchurl { + libkmodPatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; - sha256 = "0j2v0lncjfn2nw3324q3n69lw3yz3hah6bscc8xn9a2df2dcawj1"; + sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; }; in stdenv.mkDerivation rec { @@ -104,9 +104,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ] - ++ [ kmod automake111x autoconf ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; + buildInputs = [ libX11 glib libbsd kmod ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. From 9deb7821d92691788d1041ed3384027e6dddc2a0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:35:55 +0100 Subject: [PATCH 306/336] prometheus-alertmanager: 0.4.2 -> 0.5.0 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e9223b3dafd..fcdc4beb3c3 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.4.2"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1ngfilln259mh92x5wigiz70lnkgwpfbbmf5682j4pw7m3bxaam8"; + sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh"; }; # Tests exist, but seem to clash with the firewall. From c5d9bcb1db5bde39362a4851656aed75145e7db7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:36:38 +0100 Subject: [PATCH 307/336] prometheus: 1.1.2 -> 1.3.1 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index f6e58e0a745..7f66aef9d11 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.1.2"; + version = "1.3.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1k0lfmfkyibjan590wyswr65yr940w8d1zma6k3l2hc025xpi2i4"; + sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi"; }; docheck = true; From 605cdd41e2864c73536996c0888cf2f8b16832da Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Nov 2016 09:37:48 +0100 Subject: [PATCH 308/336] prometheus-nginx-exporter: 20160524 -> 20161104 --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 280f7e0abd0..4c369f40610 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "20160524-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + version = "20161104-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203"; goPackagePath = "github.com/discordianfish/nginx_exporter"; src = fetchgit { inherit rev; url = "https://github.com/discordianfish/nginx_exporter"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28"; }; goDeps = ./nginx-exporter_deps.nix; From d17160b55dea97cf58c3a02da54c91ab4da12b5b Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 7 Nov 2016 17:05:19 +0800 Subject: [PATCH 309/336] fldigi: 3.23.07 -> 3.23.15 --- pkgs/applications/audio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index a75de090033..2ee03a3f399 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.07"; + version = "3.23.15"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda"; + sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio From 6b964d953a5dd46d5f97b4612939af3bc53028d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2016 12:04:41 +0100 Subject: [PATCH 310/336] erlang-R14: remove invalid meta.maintainer --- pkgs/development/interpreters/erlang/R14.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index be7d775a668..0a93726fc0a 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 541b3fc7d2b63cc7610189c69ab8388e93f0be97 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Mon, 7 Nov 2016 12:07:29 +0100 Subject: [PATCH 311/336] cudnn5_cudatoolkit80: adding to main repo --- lib/maintainers.nix | 1 + .../science/math/cudnn/8.0-5.0/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cf996b6c32d..4de543b7d07 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -269,6 +269,7 @@ mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; + mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; mic92 = "Jörg Thalheim "; diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix new file mode 100644 index 00000000000..417e17e4bda --- /dev/null +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.0/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + version = "5.0"; + cudatoolkit_version = "8.0"; + + name = "cudatoolkit-${cudatoolkit_version}-cudnn-${version}"; + + src = requireFile rec { + name = "cudnn-${cudatoolkit_version}-linux-x64-v${version}-ga.tgz"; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library + at https://developer.nvidia.com/cudnn, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + sha256 = "af80eb1ce0cb51e6a734b2bdc599e6d50b676eab3921e5bddfe5443485df86b6"; + }; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib64/libcudnn.so + + mkdir -p $out + cp -a include $out/include + cp -a lib64 $out/lib64 + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + meta = with stdenv.lib; { + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + homepage = "https://developer.nvidia.com/cudnn"; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..84ba42b8737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,6 +1278,10 @@ in cudatoolkit = cudatoolkit75; }; + cudnn5_cudatoolkit80 = callPackage ../development/libraries/science/math/cudnn/8.0-5.0 { + cudatoolkit = cudatoolkit8; + }; + curlFull = curl.override { idnSupport = true; ldapSupport = true; From 65fe0e98d7587b8bc0e3229cab68afcfbcf45ff3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 7 Nov 2016 12:55:10 +0100 Subject: [PATCH 312/336] twitterBootstrap3: init at 3.3.7 (#19852) --- pkgs/development/web/twitter-bootstrap/v3.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/web/twitter-bootstrap/v3.nix diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix new file mode 100644 index 00000000000..461a81db857 --- /dev/null +++ b/pkgs/development/web/twitter-bootstrap/v3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "bootstrap-${version}"; + version = "3.3.7"; + + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + }; + + buildInputs = [ unzip ]; + + dontBuild = true; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + meta = { + description = "Front-end framework for faster and easier web development"; + homepage = http://getbootstrap.com/; + license = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..322c911095b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3931,6 +3931,7 @@ in ttylog = callPackage ../tools/misc/ttylog { }; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; txt2man = callPackage ../tools/misc/txt2man { }; From 78121c2118ecd8a7432e3a594b8744c67ce22898 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 12:59:05 +0100 Subject: [PATCH 313/336] build jack unstable without profiling --- pkgs/misc/jackaudio/unstable.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix index 1f8a41da32f..deda40e7cba 100644 --- a/pkgs/misc/jackaudio/unstable.nix +++ b/pkgs/misc/jackaudio/unstable.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ --classic \ - --profile \ ${optionalString (optLibffado != null) "--firewire"} \ ${optionalString (optAlsaLib != null) "--alsa"} \ --autostart=${if (optDbus != null) then "dbus" else "classic"} \ From b19b440cb8b9da74a62fb578c6e162c1a1320db5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Oct 2016 15:52:46 +0100 Subject: [PATCH 314/336] faust1: 0.9.73 -> 0.9.90 --- pkgs/applications/audio/faust/faust1.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 8749497c8ba..b9e98281a7c 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -9,11 +9,11 @@ with stdenv.lib.strings; let - version = "0.9.73"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5"; + sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; }; meta = with stdenv.lib; { @@ -167,7 +167,8 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ - --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTLIB "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ From 77afa8e6b7287abbf961fa03f73e9bdfe37bb542 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 30 Oct 2016 15:59:25 +0100 Subject: [PATCH 315/336] faust2: 2.0-a41 -> 2.0.a51 --- pkgs/applications/audio/faust/faust1git.nix | 210 ------------------ pkgs/applications/audio/faust/faust2.nix | 15 +- pkgs/applications/audio/faust/faust2lv2.nix | 7 +- .../applications/audio/faust/faust2lv2gui.nix | 14 -- pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 16 insertions(+), 236 deletions(-) delete mode 100644 pkgs/applications/audio/faust/faust1git.nix delete mode 100644 pkgs/applications/audio/faust/faust2lv2gui.nix diff --git a/pkgs/applications/audio/faust/faust1git.nix b/pkgs/applications/audio/faust/faust1git.nix deleted file mode 100644 index 94e58f22428..00000000000 --- a/pkgs/applications/audio/faust/faust1git.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ stdenv -, coreutils -, fetchgit -, makeWrapper -, pkgconfig -}: - -with stdenv.lib.strings; - -let - - version = "2016-07-19"; - - src = fetchgit { - url = "git://git.code.sf.net/p/faudiostream/code"; - rev = "16c22dc0193c10521b1dc16f98443d9c206bb5dd"; - sha256 = "01rbcjfhpd5casi72ffi1j95f65ji60l629sgav93pvs0kpdacz5"; - }; - - meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = http://sourceforge.net/projects/faudiostream/files/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon pmahoney ]; - }; - - faust = stdenv.mkDerivation { - - name = "faust-${version}"; - - inherit src; - - buildInputs = [ makeWrapper ]; - - passthru = { - inherit wrap wrapWithBuildEnv; - }; - - preConfigure = '' - makeFlags="$makeFlags prefix=$out" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - ''; - - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. - postInstall = '' - # syntax error when eval'd directly - pattern="faust2!(svg)" - (shopt -s extglob; rm "$out"/bin/$pattern) - ''; - - postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - - # The 'faustoptflags' is 'source'd into other faust scripts and - # not used as an executable, so patch 'uname' usage directly - # rather than use makeWrapper. - substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" - - # wrapper for scripts that don't need faust.wrap* - for script in "$out"/bin/faust2*; do - wrapProgram "$script" \ - --prefix PATH : "$out"/bin - done - ''; - - meta = meta // { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - - This package has just the compiler, libraries, and headers. - Install faust2* for specific faust2appl scripts. - ''; - }; - - }; - - # Default values for faust2appl. - faust2ApplBase = - { baseName - , dir ? "tools/faust2appls" - , scripts ? [ baseName ] - , ... - }@args: - - args // { - name = "${baseName}-${version}"; - - inherit src; - - configurePhase = ":"; - - buildPhase = ":"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do - cp "${dir}/$script" "$out/bin/" - done - - runHook postInstall - ''; - - postInstall = '' - # For the faust2appl script, change 'faustpath' and - # 'faustoptflags' to absolute paths. - for script in "$out"/bin/*; do - substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" - done - ''; - - meta = meta // { - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; - }; - }; - - # Some 'faust2appl' scripts, such as faust2alsa, run faust to - # generate cpp code, then invoke the c++ compiler to build the code. - # This builder wraps these scripts in parts of the stdenv such that - # when the scripts are called outside any nix build, they behave as - # if they were running inside a nix build in terms of compilers and - # paths being configured (e.g. rpath is set so that compiled - # binaries link to the libs inside the nix store) - # - # The function takes two main args: the appl name (e.g. - # 'faust2alsa') and an optional list of propagatedBuildInputs. It - # returns a derivation that contains only the bin/${appl} script, - # wrapped up so that it will run as if it was inside a nix build - # with those build inputs. - # - # The build input 'faust' is automatically added to the - # propagatedBuildInputs. - wrapWithBuildEnv = - { baseName - , propagatedBuildInputs ? [ ] - , ... - }@args: - - stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper pkgconfig ]; - - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - - postFixup = '' - - # export parts of the build environment - for script in "$out"/bin/*; do - wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUSTINC "${faust}/include/faust" \ - --prefix PATH : "$PATH" \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" - done - ''; - }); - - # Builder for 'faust2appl' scripts, such as faust2firefox that - # simply need to be wrapped with some dependencies on PATH. - # - # The build input 'faust' is automatically added to the PATH. - wrap = - { baseName - , runtimeInputs ? [ ] - , ... - }@args: - - let - - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); - - in stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper ]; - - postFixup = '' - for script in "$out"/bin/*; do - wrapProgram "$script" --prefix PATH : "${runtimePath}" - done - ''; - - }); - -in faust diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 24cab4cdbcd..6289688c53c 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,11 +16,11 @@ with stdenv.lib.strings; let - version = "2.0-a41"; + version = "2.0.a51"; src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz"; - sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm"; + url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; + sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf"; }; meta = with stdenv.lib; { @@ -53,7 +53,7 @@ let # defines 'system' env var, so undefine that so faust detects the # correct system. unset system - sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix + # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix # The makefile sets LLVM_ depending on the current llvm # version, but the detection code is quite brittle. @@ -67,7 +67,7 @@ let # # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION # to something the makefile will recognize. - sed '52iLLVM_VERSION=3.7.0' -i compiler/Makefile.unix + sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly @@ -151,7 +151,8 @@ let for script in "$out"/bin/*; do substituteInPlace "$script" \ --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" + --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \ + --replace " error " "echo" done ''; @@ -193,7 +194,9 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ + --set FAUSTLIB "${faust}/lib/faust" \ --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index 4d11395e738..3472ce5047e 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -1,11 +1,14 @@ -{ faust +{ boost +, faust , lv2 +, qt4 + }: faust.wrapWithBuildEnv { baseName = "faust2lv2"; - propagatedBuildInputs = [ lv2 ]; + propagatedBuildInputs = [ boost lv2 qt4 ]; } diff --git a/pkgs/applications/audio/faust/faust2lv2gui.nix b/pkgs/applications/audio/faust/faust2lv2gui.nix deleted file mode 100644 index af20bb1d745..00000000000 --- a/pkgs/applications/audio/faust/faust2lv2gui.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ boost -, faust1git -, lv2 -, qt4 - -}: - -faust1git.wrapWithBuildEnv { - - baseName = "faust2lv2"; - - propagatedBuildInputs = [ boost lv2 qt4 ]; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..6c854018ae0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16923,14 +16923,14 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = faust2; + faust = self.faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust1git = callPackage ../applications/audio/faust/faust1git.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_37; + llvm = llvm_38; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -16947,8 +16947,6 @@ in faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; - faust2lv2gui = callPackage ../applications/audio/faust/faust2lv2gui.nix { }; - faustCompressors = callPackage ../applications/audio/faustCompressors { }; fceux = callPackage ../misc/emulators/fceux { }; From f63c179b0b0eb08cd06adf5deb973370da80314c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:06:35 +0100 Subject: [PATCH 316/336] magnetophonDSP: update to new faust libraries --- .../audio/VoiceOfFaust/default.nix | 65 ------------------- pkgs/applications/audio/foo-yc20/default.nix | 1 + .../CharacterCompressor/default.nix | 11 ++-- .../{ => magnetophonDSP}/CompBus/default.nix | 20 ++++-- .../ConstantDetuneChorus}/default.nix | 15 +++-- .../LazyLimiter/default.nix | 15 +++-- .../MBdistortion/default.nix | 15 +++-- .../RhythmDelay/default.nix | 15 +++-- .../magnetophonDSP/VoiceOfFaust/default.nix | 56 ++++++++++++++++ .../faustCompressors/default.nix | 20 ++++-- .../magnetophonDSP/pluginUtils/default.nix | 41 ++++++++++++ .../magnetophonDSP/shelfMultiBand/default.nix | 38 +++++++++++ pkgs/top-level/all-packages.nix | 29 ++++----- 13 files changed, 213 insertions(+), 128 deletions(-) delete mode 100644 pkgs/applications/audio/VoiceOfFaust/default.nix rename pkgs/applications/audio/{ => magnetophonDSP}/CharacterCompressor/default.nix (77%) rename pkgs/applications/audio/{ => magnetophonDSP}/CompBus/default.nix (60%) rename pkgs/applications/audio/{constant-detune-chorus => magnetophonDSP/ConstantDetuneChorus}/default.nix (62%) rename pkgs/applications/audio/{ => magnetophonDSP}/LazyLimiter/default.nix (59%) rename pkgs/applications/audio/{ => magnetophonDSP}/MBdistortion/default.nix (58%) rename pkgs/applications/audio/{ => magnetophonDSP}/RhythmDelay/default.nix (58%) create mode 100644 pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix rename pkgs/applications/audio/{ => magnetophonDSP}/faustCompressors/default.nix (59%) create mode 100644 pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix create mode 100644 pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix deleted file mode 100644 index 17cb680c58c..00000000000 --- a/pkgs/applications/audio/VoiceOfFaust/default.nix +++ /dev/null @@ -1,65 +0,0 @@ - -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }: -stdenv.mkDerivation rec { - name = "VoiceOfFaust-${version}"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "magnetophon"; - repo = "VoiceOfFaust"; - rev = "v${version}"; - sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn"; - }; - - plugins = [ helmholtz mrpeach ]; - - pitchTracker = puredata-with-plugins plugins; - - buildInputs = [ faust2jack ]; - - runtimeInputs = [ pitchTracker ]; - - patchPhase = '' - sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper - ''; - - buildPhase = '' - faust2jack -osc classicVocoder.dsp - faust2jack -osc CZringmod.dsp - faust2jack -osc FMsinger.dsp - faust2jack -osc FOFvocoder.dsp - faust2jack -osc Karplus-StrongSinger.dsp - faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp - faust2jack -osc PAFvocoder.dsp - faust2jack -osc -sch -t 99999 stringSinger.dsp - faust2jack -osc subSinger.dsp - # doesn't compile on most systems, too big: - #faust2jack -osc -sch -t 99999 VocSynthFull.dsp - ''; - - installPhase = '' - mkdir -p $out/bin - cp launchers/* $out/bin/ - cp classicVocoder $out/bin/ - cp CZringmod $out/bin/ - cp FMsinger $out/bin/ - cp FOFvocoder $out/bin/ - cp Karplus-StrongSinger $out/bin/ - cp Karplus-StrongSingerMaxi $out/bin/ - cp PAFvocoder $out/bin/ - cp stringSinger $out/bin/ - cp subSinger $out/bin/ - #cp VocSynthFull $out/bin/ - mkdir $out/PureData/ - cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - ''; - - meta = { - description = "Turn your voice into a synthesizer"; - homepage = https://github.com/magnetophon/VoiceOfFaust; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - }; -} - diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 4ccbb425612..073d28ef870 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { postInstallFixup = "rm -rf $out/lib/lv2"; meta = { + broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix similarity index 77% rename from pkgs/applications/audio/CharacterCompressor/default.nix rename to pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 8e50a6f1744..206754a5195 100644 --- a/pkgs/applications/audio/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CharacterCompressor-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CharacterCompressor"; rev = "V${version}"; - sha256 = "0ci27v5k10prsmcd0g6q5vhr31mz8hsmrsdk436vfbcv3s108rcc"; + sha256 = "1h0bhjhx023476gbijq842b6f8z71zcyn4c9mddwyb18w9cdamp5"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp - faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" + faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix similarity index 60% rename from pkgs/applications/audio/CompBus/default.nix rename to pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 25175f27162..467e11daaf6 100644 --- a/pkgs/applications/audio/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CompBus-${version}"; - version = "1.1.02"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CompBus"; - rev = "v${version}"; - sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh"; + rev = "V${version}"; + sha256 = "0yhj680zgk4dn4fi8j3apm72f3z2mjk12amf2a7p0lwn9iyh4a2z"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -t 99999 $f - faust2lv2 -gui -t 99999 $f + faust2jaqt -time -vec -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" + + for f in *.dsp; + do + faust2lv2 -time -vec -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix similarity index 62% rename from pkgs/applications/audio/constant-detune-chorus/default.nix rename to pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 0f53d125911..b452d91426e 100644 --- a/pkgs/applications/audio/constant-detune-chorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "constant-detune-chorus-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "constant-detune-chorus"; - rev = "v${version}"; - sha256 = "1ks2k6pflqyi2cs26bnbypphyrrgn0xf31l31kgx1qlilyc57vln"; + rev = "V${version}"; + sha256 = "1sipmc25fr7w7xqx1r0y6i2zwfkgszzwvhk1v15mnsb3cqvk8ybn"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 ConstantDetuneChorus.dsp - faust2lv2 -gui -t 99999 ConstantDetuneChorus.dsp + faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" + faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix similarity index 59% rename from pkgs/applications/audio/LazyLimiter/default.nix rename to pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 16aca9c3d32..d1959ec3ceb 100644 --- a/pkgs/applications/audio/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "LazyLimiter-${version}"; - version = "0.3.01"; + version = "0.3.2"; src = fetchFromGitHub { owner = "magnetophon"; repo = "LazyLimiter"; - rev = "v${version}"; - sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l"; + rev = "V${version}"; + sha256 = "10xdydwmsnkx8hzsm74pa546yahp29wifydbc48yywv3sfj5anm7"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 LazyLimiter.dsp - faust2lv2 -gui -t 99999 LazyLimiter.dsp + faust2jaqt -vec -time -t 99999 LazyLimiter.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" + faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix similarity index 58% rename from pkgs/applications/audio/MBdistortion/default.nix rename to pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index aa71fff41c5..6216ba55593 100644 --- a/pkgs/applications/audio/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "MBdistortion-${version}"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "MBdistortion"; - rev = "v${version}"; - sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp"; + rev = "V${version}"; + sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 MBdistortion.dsp - faust2lv2 -gui -t 99999 MBdistortion.dsp + faust2jaqt -time -vec -t 99999 MBdistortion.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" + faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix similarity index 58% rename from pkgs/applications/audio/RhythmDelay/default.nix rename to pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 05d3b4f193e..0bb2034fc46 100644 --- a/pkgs/applications/audio/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "RhythmDelay-${version}"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "RhythmDelay"; - rev = "v${version}"; - sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7"; + rev = "V${version}"; + sha256 = "1j0bjl9agz43dcrcrbiqd7fv7xsxgd65s4ahhv5pvcr729y0fxg4"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 RhythmDelay.dsp - faust2lv2 -gui -t 99999 RhythmDelay.dsp + faust2jaqt -time -vec -t 99999 RhythmDelay.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" + faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix new file mode 100644 index 00000000000..12d9679f97c --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -0,0 +1,56 @@ +{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +stdenv.mkDerivation rec { + name = "VoiceOfFaust-${version}"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "VoiceOfFaust"; + rev = "V${version}"; + sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + }; + + plugins = [ helmholtz mrpeach ]; + + pitchTracker = puredata-with-plugins plugins; + + buildInputs = [ faust2jack faust2lv2 ]; + + runtimeInputs = [ pitchTracker ]; + + patchPhase = '' + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper + ''; + + buildPhase = '' + sh install.sh + # so it doesn;t end up in /bin/ : + rm -f install.sh + ''; + + installPhase = '' + mkdir -p $out/bin + + for file in ./*; do + if test -x "$file" && test -f "$file"; then + cp "$file" "$out/bin" + fi + done + + cp launchers/* $out/bin/ + mkdir $out/PureData/ + # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd + cp PureData/* $out/PureData/ + + mkdir -p $out/lib/lv2 + cp -r *.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Turn your voice into a synthesizer"; + homepage = https://github.com/magnetophon/VoiceOfFaust; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix similarity index 59% rename from pkgs/applications/audio/faustCompressors/default.nix rename to pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index ea0680568db..05e2b335f82 100644 --- a/pkgs/applications/audio/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "faustCompressors-${version}"; - version = "0.1.1"; + name = "faustCompressors-v${version}"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "faustCompressors"; rev = "v${version}"; - sha256 = "0x5nd2cjhknb4aclhkkjaywx75bi2wj22prgv8n47czi09jcj0jb"; + sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -double -t 99999 $f - faust2lv2 -double -gui -t 99999 $f + faust2jaqt -time -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" + + for f in *.dsp; + do + faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix new file mode 100644 index 00000000000..daa23baa966 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "pluginUtils-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "pluginUtils"; + rev = "V${version}"; + sha256 = "1hnr5sp7k6ypf4ks61lnyqx44dkv35yllf3a3xcbrw7yqzagwr1c"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + for f in *.dsp + do + echo "Building jack standalone for $f" + faust2jaqt -vec -time -t 99999 "$f" + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" + echo "Building lv2 for $f" + faust2lv2 -vec -time -gui -t 99999 "$f" + done + ''; + + installPhase = '' + rm -f *.dsp + rm -f *.lib + mkdir -p $out/lib/lv2 + mv *.lv2/ $out/lib/lv2 + mkdir -p $out/bin + cp * $out/bin/ + ''; + + meta = { + description = "Some simple utility lv2 plugins"; + homepage = https://github.com/magnetophon/pluginUtils; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix new file mode 100644 index 00000000000..422aabb2829 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "shelfMultiBand-${version}"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "shelfMultiBand"; + rev = "V${version}"; + sha256 = "1b1h4z5fs2xm7wvw11p9wnd0bxs3m88124f5phh0gwvpsdrd0im5"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp + faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp shelfMultiBand $out/bin/ + cp shelfMultiBandMono $out/bin/ + mkdir -p $out/lib/lv2 + cp -r shelfMultiBand.lv2/ $out/lib/lv2 + cp -r shelfMultiBandMono.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A multiband compressor made from shelving filters."; + homepage = https://github.com/magnetophon/shelfMultiBand; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c854018ae0..0bbb6efc827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12260,8 +12260,6 @@ in amdappsdk = amdappsdk28; }; - CharacterCompressor = callPackage ../applications/audio/CharacterCompressor { }; - chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chirp = callPackage ../applications/misc/chirp { @@ -12310,14 +12308,10 @@ in communi = qt5.callPackage ../applications/networking/irc/communi { }; - CompBus = callPackage ../applications/audio/CompBus { }; - compiz = callPackage ../applications/window-managers/compiz { inherit (gnome2) GConf ORBit2 metacity; }; - constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; - copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { @@ -13473,8 +13467,6 @@ in caps = callPackage ../applications/audio/caps { }; - LazyLimiter = callPackage ../applications/audio/LazyLimiter { }; - lastwatch = callPackage ../applications/audio/lastwatch { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; @@ -13604,6 +13596,19 @@ in lyx = callPackage ../applications/misc/lyx { }; + magnetophonDSP = { + CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; + CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; + ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; + faustCompressors = callPackage ../applications/audio/magnetophonDSP/faustCompressors { }; + LazyLimiter = callPackage ../applications/audio/magnetophonDSP/LazyLimiter { }; + MBdistortion = callPackage ../applications/audio/magnetophonDSP/MBdistortion { }; + pluginUtils = callPackage ../applications/audio/magnetophonDSP/pluginUtils { }; + RhythmDelay = callPackage ../applications/audio/magnetophonDSP/RhythmDelay { }; + VoiceOfFaust = callPackage ../applications/audio/magnetophonDSP/VoiceOfFaust { }; + shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; + }; + makeself = callPackage ../applications/misc/makeself { }; marathon = callPackage ../applications/networking/cluster/marathon { }; @@ -13612,8 +13617,6 @@ in matchbox = callPackage ../applications/window-managers/matchbox { }; - MBdistortion = callPackage ../applications/audio/MBdistortion { }; - mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -14317,8 +14320,6 @@ in retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); - RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; - ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -14969,8 +14970,6 @@ in vnstat = callPackage ../applications/networking/vnstat { }; - VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { }; - volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; @@ -16947,8 +16946,6 @@ in faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; - faustCompressors = callPackage ../applications/audio/faustCompressors { }; - fceux = callPackage ../misc/emulators/fceux { }; flat-plat = callPackage ../misc/themes/flat-plat { }; From eb9d126d2c1a8d3d52442c80b04c2d3dcda09397 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Mon, 7 Nov 2016 14:15:33 +0100 Subject: [PATCH 317/336] linux_mptcp: 0.91 -> 0.91.2 --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 52a52562d60..199ff9122cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91"; - modDirVersion = "4.1.26"; + mptcpVersion = "0.91.2"; + modDirVersion = "4.1.35"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3"; + sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..1928c5fd5dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10826,7 +10826,6 @@ in linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.hiddev_CVE_2016_5829 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From f7b7d860158e7ccffc4e4f8346c1c89d52ee61c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:17:49 +0100 Subject: [PATCH 318/336] lv2-unstable: init at 2016-10-23 --- .../libraries/audio/lv2/unstable.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/audio/lv2/unstable.nix diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix new file mode 100644 index 00000000000..034282c4f3a --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-unstable-${version}"; + version = "2016-10-23"; + + src = fetchgit { + url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; + rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12"; + sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; + }; + + buildInputs = [ gtk2 libsndfile pkgconfig python ]; + + configurePhase = "${python.interpreter} waf configure --prefix=$out"; + + buildPhase = "${python.interpreter} waf"; + + installPhase = "${python.interpreter} waf install"; + + meta = with stdenv.lib; { + homepage = http://lv2plug.in; + description = "A plugin standard for audio systems"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d80..f3b7dd83a76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9023,6 +9023,7 @@ in lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; + lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lvtk = callPackage ../development/libraries/audio/lvtk { }; From c10d653ac53e235a09c33e6cd055f3bc52bf3234 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:19:02 +0100 Subject: [PATCH 319/336] ganv: svn 5675 -> unstable 2016-10-15 --- pkgs/development/libraries/ganv/default.nix | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 6af09bd5179..7530d82a7e3 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "ganv-svn-${rev}"; - rev = "5675"; + name = "ganv-unstable-${rev}"; + rev = "2016-10-15"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ganv"; - rev = rev; - sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ganv.git"; + rev = "31685d283e9b811b61014f820c42807f4effa071"; + sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtkmm2 pkgconfig python ]; + buildInputs = [ graphviz gtk2 gtkmm2 pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; From 16c54ff2086892a04644579ed70d6c1c8876925f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 7 Nov 2016 14:20:13 +0100 Subject: [PATCH 320/336] ingen: svn 5675 -> unstable 2016-10-29 --- pkgs/applications/audio/ingen/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9a336576d3a..68990b11ef0 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: stdenv.mkDerivation rec { - name = "ingen-svn-${rev}"; - rev = "5675"; + name = "ingen-unstable-${rev}"; + rev = "2016-10-29"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ingen"; - rev = rev; - sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; + sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; }; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig - python raul serd sord-svn sratom suil + boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + python raul serd sord sratom suil ]; configurePhase = '' From 88c4cc866084844842f834f9f811569d26703636 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 7 Nov 2016 09:05:58 -0500 Subject: [PATCH 321/336] faust1git: remove, fixup PR #19992 --- 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 2a1fd674772..11c86d3410d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16927,8 +16927,6 @@ in faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust1git = callPackage ../applications/audio/faust/faust1git.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { llvm = llvm_38; }; From a2149d61abe2aa5aaac367748a95edac54d1af92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Faille?= Date: Sun, 16 Oct 2016 10:28:16 -0400 Subject: [PATCH 322/336] yamllint: init 0.5.2 yamllint: add myself as maintainer --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4de543b7d07..e463e852933 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -276,6 +276,7 @@ michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; + mikefaille = "Michaël Faille "; mimadrid = "Miguel Madrid "; mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95bd6b4d1fd..78f9187e7a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31123,4 +31123,25 @@ in { maintainers = with maintainers; [ bennofs ]; }; }; + + yamllint = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yamllint"; + version = "0.5.2"; + + src = pkgs.fetchurl{ + url = "mirror://pypi/y/${pname}/${name}.tar.gz"; + sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ pyyaml ]; + + meta = { + homepage = "https://github.com/adrienverge/yamllint"; + description = "A linter for YAML files"; + license = licenses.gpl3; + maintainers = with maintainers; [ mikefaille ]; + }; + }; } From 95b5e4c46a5bc95b427aeacfe0f73ac228fbc309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20N=C3=B6tzli?= Date: Mon, 7 Nov 2016 11:24:15 -0800 Subject: [PATCH 323/336] NixOS manual: Update link to list of AMIs --- nixos/doc/manual/installation/obtaining.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index f6e8b218e2b..20a4838be88 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -32,7 +32,7 @@ running NixOS system through several other means: Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the list + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs. From 7fa157c5587d40ca757658e2c8017055c3c0419e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 30 Oct 2016 20:39:53 +0100 Subject: [PATCH 324/336] services: Add Interplanetary File System service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/network-filesystems/ipfs.nix | 111 ++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/ipfs.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c75c22472bd..80a9a520e24 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -278,6 +278,7 @@ postgrey = 258; hound = 259; leaps = 260; + ipfs = 261; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -526,6 +527,7 @@ postgrey = 258; hound = 259; leaps = 260; + ipfs = 261; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 356cb5a92ed..8254ada3ddf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -318,6 +318,7 @@ ./services/monitoring/zabbix-server.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/drbd.nix + ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs-client/default.nix diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix new file mode 100644 index 00000000000..c26a7073703 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -0,0 +1,111 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inherit (pkgs) ipfs; + + cfg = config.services.ipfs; + + ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}''; + +in + +{ + + ###### interface + + options = { + + services.ipfs = { + + enable = mkEnableOption "Interplanetary File System"; + + user = mkOption { + type = types.str; + default = "ipfs"; + description = "User under which the IPFS daemon runs"; + }; + + group = mkOption { + type = types.str; + default = "ipfs"; + description = "Group under which the IPFS daemon runs"; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/ipfs"; + description = "The data dir for IPFS"; + }; + + autoMigrate = mkOption { + type = types.bool; + default = false; + description = '' + Whether IPFS should try to migrate the file system automatically. + ''; + }; + + enableGC = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable automatic garbage collection. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + description = "Extra flags passed to the IPFS daemon"; + default = []; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ipfs ]; + + users.extraUsers = mkIf (cfg.user == "ipfs") { + ipfs = { + group = cfg.group; + home = cfg.dataDir; + createHome = false; + uid = config.ids.uids.ipfs; + description = "IPFS daemon user"; + }; + }; + + users.extraGroups = mkIf (cfg.group == "ipfs") { + ipfs = { + gid = config.ids.gids.ipfs; + }; + }; + + systemd.services.ipfs = { + description = "IPFS Daemon"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + path = [ pkgs.ipfs pkgs.su pkgs.bash ]; + + preStart = + '' + install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then + cd ${cfg.dataDir} + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" + fi + ''; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + }; + }; +} From f17e13a0d589725efbdda19a9a966e6321f705e4 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Nov 2016 05:18:29 +0800 Subject: [PATCH 325/336] xdotool: 3.20150503.1 -> 3.20160805.1 --- pkgs/tools/X11/xdotool/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 4c675a69842..f69d5d80649 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { name = "xdotool-${version}"; - version = "3.20150503.1"; + version = "3.20160805.1"; + src = fetchurl { url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; - sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"; + sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; }; nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ]; + preBuild = '' + mkdir -p $out/lib + ''; + makeFlags = "PREFIX=$(out)"; meta = { From 3e6d04da57429810ee4bfb1e92779bde2f47c5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Nov 2016 22:57:41 +0100 Subject: [PATCH 326/336] texlive: disable xindy on Darwin for now (#20062) --- pkgs/tools/typesetting/tex/texlive/bin.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index d41dbcfef0d..5591f64cee9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -279,6 +279,10 @@ xdvi = stdenv.mkDerivation { # TODO: it's suspicious that mktexpk generates fonts into ~/.texlive2014 }; +} # un-indented + +// stdenv.lib.optionalAttrs (!stdenv.isDarwin) # see #20062 +{ xindy = stdenv.mkDerivation { name = "texlive-xindy.bin-${version}"; @@ -309,6 +313,6 @@ xindy = stdenv.mkDerivation { ''; }; +} -} # un-indented From c950840544f0a6fdf260692e67245f5c2028ce4d Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 7 Nov 2016 11:38:23 +1100 Subject: [PATCH 327/336] motion: init at 4.0.1 --- pkgs/applications/video/motion/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/video/motion/default.nix diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix new file mode 100644 index 00000000000..d5215488707 --- /dev/null +++ b/pkgs/applications/video/motion/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libjpeg, ffmpeg }: + +stdenv.mkDerivation rec { + name = "motion-${version}"; + version = "4.0.1"; + src = fetchFromGitHub { + owner = "Motion-Project"; + repo = "motion"; + rev = "release-${version}"; + sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { + homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; + description = "Monitors the video signal from cameras"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.puffnfresh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b7aa702a8..6bc2ee34452 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2378,6 +2378,8 @@ in most = callPackage ../tools/misc/most { }; + motion = callPackage ../applications/video/motion { }; + mkcast = callPackage ../applications/video/mkcast { }; multitail = callPackage ../tools/misc/multitail { }; From b61b2806dbf996a6af1359179dfe3a86a191974f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:12 -0500 Subject: [PATCH 328/336] elpa-packages: 2016-11-07 --- pkgs/applications/editors/emacs-modes/elpa-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 8c5b24e7ad8..2e050d730fc 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1351,10 +1351,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161031"; + version = "20161102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161031.tar"; - sha256 = "0b4dzdimdkp7116cyyq80n4h71qc477akiblbabnpb8sg87qqg7r"; + url = "https://elpa.gnu.org/packages/org-20161102.tar"; + sha256 = "12v9jhakdxcmlw9zrcrh1fwi3kh6z0qva90hpnr0zjqyj72i0wir"; }; packageRequires = []; meta = { From 19aad5c98490bbc17d11287a5821869bc3903ea6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:25 -0500 Subject: [PATCH 329/336] org-packages: 2016-11-07 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 642b3ebdb5f..bdade742b04 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161031"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161031.tar"; - sha256 = "1nabn8kj50bxvm3b429j73xipq557kx5j4nr7s5bwxs85i89133q"; + url = "http://orgmode.org/elpa/org-20161102.tar"; + sha256 = "1mj100pnxskgrfmabj0vdmsijmr7v5ir7c18aypv92nh3fnmiz0f"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161031"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161031.tar"; - sha256 = "1j0mwqmdyslvdfhd3x9c9li8s41wsaxk81qzfizdwxl9csdf9ki4"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161102.tar"; + sha256 = "124rizp50jaqshcmrr7x2132x5sy7q81nfb37482j9wzrc9l7b95"; }; packageRequires = []; meta = { From 6449b122ebc9b835b5fcd27fd888574582505efb Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:34:35 -0500 Subject: [PATCH 330/336] melpa-stable-packages: 2016-11-07 Removals: - closql: repository moved, recipe not updated - epkg: repository moved, recipe not updated - frame-restore: recipe removed from melpa - gulp-task-runner: version tag no longer present - weblogger: moved to github, version tag no longer present --- .../emacs-modes/melpa-stable-generated.nix | 474 +++++++++--------- 1 file changed, 227 insertions(+), 247 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 6c1f92a69ef..c7d7c5b5ed1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1031,12 +1031,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "9266eeb6ab2eef04389850422d7da059c707380e"; - sha256 = "169g2dk3m0f7z64pjxcs918r6j5g2pzphrylr2vm40kppigy8gmw"; + rev = "692ac0816783725600b80b5307bf48a83053a378"; + sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1627,12 +1627,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "0.1.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "6fe75d409323554d4c4f35ac0e90963fe90d3a43"; - sha256 = "0lc0j6ffd6cpqnpfvpqm7rfxblj34pg9vw3zs1hkg15g7qw0nh5c"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3418,12 +3418,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "1.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "43931dbb96c3aa5df8dda030503f1458dc6ca1c5"; - sha256 = "0kn3nsdlsgd6hlq7c32kp29bhh9zych727sbx028w1bidjsvjlly"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3888,27 +3888,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "0.2.0"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; - sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -3954,12 +3933,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0pre2"; + version = "3.7.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "876da11858ab6649bb088c4bb7758fc84910ba20"; - sha256 = "179925wbpnfiazqizw5zrhcdb5pi5a8x2x9m5wp0mvw9gxvmnwvn"; + rev = "adf5f253ec029aec4ee7aadb95c6f908030fb98b"; + sha256 = "1dbpxhs3ss91b9q4cvx8fl60zf7w8jad4cbm5cqpzhi6jfac5gxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4374,12 +4353,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "c77e9c6f87a7853787c70eae885e12b6162d4cc5"; - sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd"; + rev = "3dad255d6928e28e7a700d8cbac060f87d43d25e"; + sha256 = "1g4dxps5s93ivs0ca6blia8spchdykny12c1gygm6jh9m6k7kfvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -4779,12 +4758,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -5846,12 +5825,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -6265,12 +6244,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6286,12 +6265,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6612,8 +6591,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7196,12 +7175,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "a3241316207b6b623c5ae61e8fe8fb17783b981b"; - sha256 = "07vdvjy4x21gyw2r4rxrj929hj1jp4a8igwgb2m5a5x50capwzhy"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -7851,12 +7830,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -7935,12 +7914,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -7956,12 +7935,12 @@ emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -7977,12 +7956,12 @@ emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -7998,12 +7977,12 @@ emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -8452,27 +8431,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "1.0.2"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; - sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -9436,6 +9394,27 @@ license = lib.licenses.free; }; }) {}; + evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-mc"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "gabesoft"; + repo = "evil-mc"; + rev = "ccda120de2fea505147a85232c9500285edd98e8"; + sha256 = "199wcxjqyr9grvw0kahzhkh8kcg53baxhahizrknwav8mpmrvj9z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; + sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs"; + name = "evil-mc"; + }; + packageRequires = [ cl-lib emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-mc"; + license = lib.licenses.free; + }; + }) {}; evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; @@ -11669,27 +11648,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "0.5"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "5bfd06e18cdf5031062de5e052e9a877c3953804"; - sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-helper"; @@ -12791,12 +12749,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "2043fb8ee90c119b13bc8caf85fdf0a05f494b98"; - sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -13295,12 +13253,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; - sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; + rev = "cd80b8e8a7075484941720e24faa3c9a98cfa2cc"; + sha256 = "0l6vlh8sszsxjs49xsiwfbzcbc55fmiry96g3h1p358nfrg20017"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13541,8 +13499,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -13763,27 +13721,6 @@ license = lib.licenses.free; }; }) {}; - gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gulp-task-runner"; - version = "1.0"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "gulp-task-runner"; - rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; - sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; - sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; - name = "gulp-task-runner"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gulp-task-runner"; - license = lib.licenses.free; - }; - }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -14623,22 +14560,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "0.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "2204710b8a8e68c8cd4c8528eb6de4ad900941da"; - sha256 = "0h3iql8dxq80vpr1cv7fdaw0aniykp2rfzh07j5941jkiy4q63h0"; + rev = "7db5ea9ce97502152a6bb1fe38f8fabb5a49abd2"; + sha256 = "08llqkswilzsigh28w9qjbqi5g5z0ylfabz5sqia7c18gjshvz0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -15739,12 +15676,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b"; + sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -16474,12 +16411,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "f3aca4c07178c56080e4c85875f78321e94a9649"; - sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7"; + rev = "a879ddc36fedc30311693f308f414c520fdfc370"; + sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -16639,22 +16576,22 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -17019,12 +16956,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "3d64dec24b01bc582801db537ed12a5812f4f0ee"; - sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d"; + rev = "250ed1e03359fe5b29070da13cd55abc6deb0cda"; + sha256 = "168bnirfqpgiqmrjs52ixzqzq074y9szvxi6bml9zbxi8dcmafaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -17269,12 +17206,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c"; - sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg"; + rev = "c669a9b28dc09806c30864659f6ac924045a083d"; + sha256 = "0fykdci5vi84xrnghaqfs79zsi8x6kv77wx5xw6yphjksdqrp2f3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -19236,12 +19173,12 @@ magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-stgit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "d1793345a8d32b2c509077d634ca73148a68de4b"; - sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -19257,12 +19194,12 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "c6222981d4aae088d658cce5e58a14efea8590d6"; - sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -19278,12 +19215,12 @@ magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "732de604c31c74e9da24616428c6e9668b57c881"; - sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -21209,12 +21146,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "537e584d115fb056a23a0b055e0a28f543182c45"; - sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq"; + rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; + sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22138,12 +22075,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "0ead4f715b0a8fd21428f763cfc502177d82b3db"; - sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -22407,22 +22344,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "9e7453874e472ade60b95af44167d5a6d4e24317"; - sha256 = "0nccb2w3zjgx2w2x207w3100c7c4d1ii22j1qaz3v623d7azn0qq"; + rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e"; + sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -22847,12 +22784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -23183,12 +23120,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -23414,12 +23351,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.20"; + version = "2.22"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "f0fd4fe8b6cd368cab077177c3eb8be092856b49"; - sha256 = "069crk0xdm061m4jipkgwh1n4845cpa9j7dvg8ngqzrd4j2f243x"; + rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc"; + sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -23477,12 +23414,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.4.1"; + version = "2.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "9086bd2241f86488e816682af0ef9897569ab31b"; - sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465"; + rev = "e9053ef6a7c9a433f2e5e612ba507459ded2840b"; + sha256 = "00jm904qnj9d6286gfixbcd5awwza5pv9vkisfpz6j7705bjvmap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -23538,12 +23475,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3"; - sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw"; + rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; + sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -23580,12 +23517,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3831280b746049ab0dd76c4ab1facf35a7e91ff5"; - sha256 = "14wj10yc0qg1g9sky8sgrlimc9a4fxk1jxvmacswb71s51vm906n"; + rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db"; + sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -25549,12 +25486,12 @@ qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "coldnew"; repo = "qml-mode"; - rev = "efb465917f260b4b18c30bd45c58bc291c8246f0"; - sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a"; + rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c"; + sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode"; @@ -25633,12 +25570,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "0f0246ddad7d89205b1babe228c4b132c19dded3"; - sha256 = "0zvv83rrchq92yqi6w14q5m88fva7gcm8q4vhj226acf5iq1xwdm"; + rev = "8ad54e7674e49735390d63e3aea828a4d4bcddd0"; + sha256 = "0xj5iki10cg8j8vvqjlw6lfx97k3agwirhchcjnzbnkry48x9qi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -25651,6 +25588,27 @@ license = lib.licenses.free; }; }) {}; + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "railscasts-reloaded-theme"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "thegeorgeous"; + repo = "railscasts-reloaded-theme"; + rev = "c2b6f408606c3f89ddbd19325bdbfc9a9d3d2168"; + sha256 = "1lkm0shfa7d47qmpjg1q4awazvf6ci68d98zy04r018s31isavxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; + sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; + name = "railscasts-reloaded-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/railscasts-reloaded-theme"; + license = lib.licenses.free; + }; + }) {}; rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; @@ -26578,12 +26536,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "da75268b1caa973402ab17e501718da7fc748b34"; - sha256 = "0pir76xhi58nqfmjcijn5s7dz3pjjz43g97hh7sd1m32s8saddm1"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -26743,6 +26701,27 @@ license = lib.licenses.free; }; }) {}; + rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rust-mode"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust-mode"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; + sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc"; + name = "rust-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rust-mode"; + license = lib.licenses.free; + }; + }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -27983,12 +27962,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "2350913f1db3b3744d2ff23c9f0f1676c8c9289e"; - sha256 = "1bz8k56w50mfdsyg3m7x4iibkzv4jiwwlxqlqmxclx9l45hz4ppx"; + rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1"; + sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -29929,6 +29908,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; @@ -30120,12 +30120,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "5e20a6fbbed0a74a16c834a8e3e7950bdd5a9149"; - sha256 = "0nsh2rz9w33m79rrr8nrz3g1wcgfrv7dc8q9g3s82ckj5g8gxfpr"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -31320,26 +31320,6 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { - pname = "weblogger"; - version = "1.4.5"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; - name = "weblogger"; - }; - packageRequires = [ xml-rpc ]; - meta = { - homepage = "https://melpa.org/#/weblogger"; - license = lib.licenses.free; - }; - }) {}; webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; @@ -31511,12 +31491,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "fc7482e4a2063697738a405686ebc62d87697ab8"; - sha256 = "1a52pc4iwr2mmby6h16vl436cm0psxnfgd3lhkqbq86sw3p78bx8"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -32284,22 +32264,22 @@ license = lib.licenses.free; }; }) {}; - yaml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "a817e46cc55eb90b7e1dd7cff74e43e080f0f690"; - sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1"; + rev = "2ace378bef2047a980fba0e42e3e6b5d990f2c66"; + sha256 = "1wx4gqkg0v0mcykimiihrp4lg2s9qac31w8rw5frbs1r37v3l8x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc"; name = "yaml-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/yaml-mode"; license = lib.licenses.free; @@ -32494,22 +32474,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "0c662244a7d619938ec3673c21c735c19ee4e659"; - sha256 = "1c0r12dnhax5amiy01y0npm57r4wg8ln0ay4bick1f2jgc47g36k"; + rev = "a9fc16f317cade7db85433e66c80ba784e07a975"; + sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From 4fc5946d5f5b9352dc2237eb9e471d69c1816e7d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 7 Nov 2016 19:41:26 -0500 Subject: [PATCH 331/336] melpa-packages: 2016-11-07 Removals: - closql: repository moved, recipe not updated - epkg: repository moved, recipe not updated - flycheck-protobuf: recipe removed from melpa - frame-restore: recipe removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1416 +++++++++-------- 1 file changed, 751 insertions(+), 665 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b074e657309..3130ded9f62 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20161007.132"; + version = "20161102.415"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "692ac0816783725600b80b5307bf48a83053a378"; - sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; + rev = "a7ef8e703c17c978a82f442c88d250371c5e06f7"; + sha256 = "0gfa1a17wwp66jl0v6pbp9fcn45kp3jsvpd7ha4j590ijikz2yv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1570,12 +1570,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161021.251"; + version = "20161103.139"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "0c4832d86e87cc2768d8ef6827d2e367ea8de403"; - sha256 = "0449xh64lxng6pkavln4gxkrsrhngm2zmvc7lqawniq4j5j2izr3"; + rev = "01c487419f2785a4573bdd7e49800414a6f83fe7"; + sha256 = "0fxca3mg3335n4frl332ng1zndw1j3dski7gwa4j4pixc2ihi02m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -2365,18 +2365,19 @@ license = lib.licenses.free; }; }) {}; - applescript-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: + applescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "applescript-mode"; - version = "20120205.307"; - src = fetchsvn { - url = "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk"; - rev = "584"; - sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml"; + version = "20090320.2332"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "applescript-mode"; + rev = "8f888cd80af1e0902b5609143facd3051bc94892"; + sha256 = "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/79d8790798305d5e0a75b289c5d8d1b6567c0c7d/recipes/applescript-mode"; - sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/576e42b33a5245e1aae0f0d879fd18762342db32/recipes/applescript-mode"; + sha256 = "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4"; name = "applescript-mode"; }; packageRequires = []; @@ -2695,12 +2696,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20161010.2322"; + version = "20161103.1036"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "31b169150c58b8d40db552094018ed7b053d234d"; - sha256 = "0m9kqyd0krfvp5vliqj3rcdd9j32r4hlxhhvb6mx2lvjxfmdi1wi"; + rev = "82428780ec96e18ae801783f8d7388749fafd5fa"; + sha256 = "17kznp00gs162b205q8mzy6abcf3jrmnqfb1vdv86rk1gzsr483q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; @@ -2758,12 +2759,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160914.1337"; + version = "20161101.1955"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "7e2c683d2d45f0c4901c4c492004b78345425d41"; - sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz"; + rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; + sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2779,12 +2780,12 @@ atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: melpaBuild { pname = "atomic-chrome"; - version = "20161030.629"; + version = "20161106.1438"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "atomic-chrome"; - rev = "f9a7d4c5d6bdcb0d689d41b6b9c604997b7971ab"; - sha256 = "1v6d9l7db85ql01grx7nyz4516q41rqwyzb85xk2zx6zhx3d99ns"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; @@ -3879,11 +3880,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20160325.1515"; + version = "20161106.509"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -5254,12 +5255,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161031.1257"; + version = "20161106.723"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "6012b4b98c1934e567f74b48b27fd67f46ad2208"; - sha256 = "0xyqjfmi0jnhbb8jwr6q0ynkr20vbi1npxc94kf7ddn2cgxvp0j1"; + rev = "dea1f7e830b38e6b70db5a318eaa269f417444d4"; + sha256 = "0f6yrls2l37rpq932n7h5fr6688vsk32my300z66mszcqfvmr566"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6357,12 +6358,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161019.542"; + version = "20161107.426"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "6964b08c9474a2cd4809e66efa646b871139b5d1"; - sha256 = "17jc1jvys1a3rg5hvcwkzcq98slwcidff89f7vri23hks69dc2bp"; + rev = "059b1ca83e58a4ced0a0f1cd1b4e06525fdc257a"; + sha256 = "15bgxdz65wywkckwm9rxf595hc8gabqb2015hwp1n9pa8k511jkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6798,7 +6799,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11866"; + rev = "11867"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6939,12 +6940,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20151203.151"; + version = "20161106.1219"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "c4d9af19bf563977dd74863bb70d1aa783952f1c"; - sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y"; + rev = "329ac84def1af01c19761bd745ee4f275003161f"; + sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -6981,12 +6982,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20161020.45"; + version = "20161105.1306"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "e0a001819033b01e95aae81246dbcd5db659695d"; - sha256 = "0w1napa2zmxmh5dvk5sdxl1w7pl27vjjmqhbjxljh4vs2vy2v9zi"; + rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548"; + sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7149,12 +7150,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161031.414"; + version = "20161106.1712"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "4e5267fab7765661075c0e79122ec358cfb7feb5"; - sha256 = "0lhs6skd6jvgs9hk1f564mc94cd2fxn56dhnpdwqijrg9a4c06m5"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7566,12 +7567,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161023.1346"; + version = "20161104.1348"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7653,7 +7654,7 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "285627"; + rev = "286103"; sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx"; }; recipeFile = fetchurl { @@ -8039,12 +8040,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161017.1134"; + version = "20161105.2359"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8064,8 +8065,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8141,27 +8142,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "20161025.947"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "c230818f23f0663c5775c4ec05136b8ff5862367"; - sha256 = "0qnxfzancvpn36fq4q0v7fj0p5ra1qm1rkh5yw4ldiz6bj7h6r67"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; @@ -8295,8 +8275,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "098a18c476b5e60b3bacc0e47f23359fc4a3ea2c"; - sha256 = "0aqza32r1rwhhrzckprcs7gch55l952007h2n7pf2jx0napk9rid"; + rev = "9df1cb0fa68869f8125025f20fa8c64467aab2e8"; + sha256 = "0p3xi5jhz0k6hf1nx6srfaidckwlw2bcsvb63q9bbchaap17lpia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8330,6 +8310,27 @@ license = lib.licenses.free; }; }) {}; + cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "cmd-to-echo"; + version = "20161105.505"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "cmd-to-echo"; + rev = "b8915d5f0a79767c29f38ccb7b4416390436e932"; + sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; + sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; + name = "cmd-to-echo"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/cmd-to-echo"; + license = lib.licenses.free; + }; + }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; version = "20160830.1130"; @@ -8975,12 +8976,12 @@ commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commify"; - version = "20160724.2032"; + version = "20161106.1534"; src = fetchFromGitHub { owner = "ddoherty03"; repo = "commify"; - rev = "61db2dd77fc68a82767ae71a81a7059a97bcf115"; - sha256 = "0z6zpxrv0c21vv3k4kzahfl32db33h7v1x4ip1adskjdj4pa013g"; + rev = "78732c2fa6c1a10288b7436d7c561ec9ebdd41be"; + sha256 = "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify"; @@ -9197,8 +9198,8 @@ src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "38674bb993874a40c7a7b96f7a3f326d29d34e46"; - sha256 = "06197qn3739bcjzlgr45a3c11xgq151f40g39am5998dj3156524"; + rev = "1929d2172875a27133d06196cd3427b7c475b7c5"; + sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9326,12 +9327,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20160331.1641"; + version = "20161105.2138"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "00ff8210cf80b4bc4ec0fe8f42b8a00315241f32"; - sha256 = "1ipknikwyd6h2w72s5sn32mfql4p2cmgv868n13r3wg42c619blq"; + rev = "af70f5d12a38919d5728a32784674e70566cbce6"; + sha256 = "0a1ak43js2ag157mvzyjvjh3z1x4r3r2541rbh5ihwlix6c5v637"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -9435,8 +9436,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9903,8 +9904,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9983,12 +9984,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20160922.1700"; + version = "20161103.743"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10234,12 +10235,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161030.48"; + version = "20161104.828"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10486,12 +10487,12 @@ creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "20161024.2339"; + version = "20161105.144"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "bc8ef72dd2b974354bdb108d73fd5468304d1b51"; - sha256 = "0p7f47n10ckd8iqa9r2gps5yf235v88ssla177fn370j0lnhhayi"; + rev = "a0071bf037a7f2d87097918fe5338e23f4736edd"; + sha256 = "0ch5xm2mnkd7inh7m5ir12w2b6zprzsqsl9asayhd0kpnk7r0yz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; @@ -10715,12 +10716,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160909.1316"; + version = "20161105.512"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "b87332e7f9fd543e4b3d32ed97b96daf7426c31f"; - sha256 = "138kkwq5dflypz52b2md53jmp3j1z8nyivwf4bs22j5skp4p9411"; + rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7"; + sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11520,12 +11521,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161018.136"; + version = "20161106.410"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11566,8 +11567,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12043,12 +12044,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161029.1731"; + version = "20161103.1337"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "bc5d373bf22bb2458d5a5f9a9cf1917ab34b32f8"; - sha256 = "1kj8pr42cijk6xzj94hrkbplbark4dqrb0hcy7929ps80zbjqkn2"; + rev = "830a1f10982abe586c9d13685007d191eda6fbdc"; + sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12228,22 +12229,22 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20161023.1607"; + version = "20161102.1726"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "fa74f2f513351464f01a133b145339014811d042"; - sha256 = "0s5rdhghcr26qwk8xlankbivayg5246knbkkaifpy64gpl3v0k51"; + rev = "c476e4080de7bea98a7a9a1173df20397d1c7671"; + sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6"; name = "diff-hl"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/diff-hl"; license = lib.licenses.free; @@ -12356,12 +12357,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20161008.1332"; + version = "20161023.1329"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -13875,12 +13876,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161009.1630"; + version = "20161103.1722"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "af85fb024a5d18852cc86ad791f966e77aa7e4ad"; - sha256 = "02rpcziiqaqfzj36aldcpx9z5r8bz1ngp6fqwdya8jxpzydvcz9a"; + rev = "6a33ec057419e14ef0494e5ed1291cff4c8723e2"; + sha256 = "0c5v0ry6bk47hb90ghry96arvdzdhfidy0d9ffslxdf0j7zfw4i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14216,6 +14217,27 @@ license = lib.licenses.free; }; }) {}; + drone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "drone"; + version = "20161106.118"; + src = fetchFromGitHub { + owner = "olymk2"; + repo = "emacs-drone"; + rev = "1d4ee037ad3208847a4235426edf0c4a3e7b1899"; + sha256 = "1dwxgzf32cvfi7b6zw3qzamj82zs2c0ap6i1w0jqqgzmkz20dqvf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b62e697798627b07000ac72c19ecd1d89c22229/recipes/drone"; + sha256 = "0wjbmgic715i4nxk90nasfamk04lskl8dll9y5klk32w1lsj546q"; + name = "drone"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/drone"; + license = lib.licenses.free; + }; + }) {}; dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: melpaBuild { pname = "dropbox"; @@ -14302,7 +14324,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1767359"; + rev = "1768508"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14361,12 +14383,12 @@ dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dts-mode"; - version = "20150403.1604"; + version = "20161103.523"; src = fetchFromGitHub { owner = "bgamari"; repo = "dts-mode"; - rev = "6ec1443ead16105234765f9b48df9b4aca562e61"; - sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l"; + rev = "9ee0854446dcc6c53d2b8d2941051768dba50344"; + sha256 = "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/864a7ec64c46a0357710bc80ad4880dd35b2fda1/recipes/dts-mode"; @@ -14487,11 +14509,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161015.530"; + version = "20161103.628"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -14843,12 +14865,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20160727.2025"; + version = "20161031.2119"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "751a1d717840d9f526f26cf43e88d44981a6b14f"; - sha256 = "027w2sjagv74g9bx1k4w2f79fmxwvdsk2625abjlv7mly3aigzyy"; + rev = "6f43c8d575274349757173b9bcad3bf5b59300ac"; + sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -14927,12 +14949,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20161029.1119"; + version = "20161106.2351"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "cbe1e6dad9fe5a1fbe48e2f74d734c82d920be88"; - sha256 = "0w58jfj4mnhniq6n78y1yffs0md2xnrs8d1iqn34vagnp9zlr589"; + rev = "4617ea9cc952ab63dddf8a38ce21ae32442f51f0"; + sha256 = "01f71sxbif5hmgfd9696cwp541a93138d00y58szl1my0wxk0j4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15365,12 +15387,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160904.1508"; + version = "20161105.2212"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "bf3bedb6f3740b1df20d7ab344c16984b141eac4"; - sha256 = "0aam813888m3smnh8ycmsmlb9nlkrxfv9myd7crvjgbsc6413bnp"; + rev = "0946f6672d95a943f1071e678aa91af6e614a143"; + sha256 = "1v5gf3jlb7pi08yjcglghsrwzvdms3r2cpgg2hzd2panwm623wz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15525,8 +15547,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "1d5b34e4813000b61255f56af15d005a5947ef92"; - sha256 = "19jdix3r1pl2p6v9jrhgpf3h0fdl74js8xrj83c4lffhi3ry5w3x"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15712,8 +15734,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "2e03d2d12af7b38c92a89ab6f61dd69f163fbd90"; - sha256 = "1csxihkh874p8jm0ndhwl1pnk3k5jdazxba439rzd8ni0rppsi4q"; + rev = "4b767b8565c5090538b1d73500dd50f2102150cb"; + sha256 = "1ddfz4b0bphixg3maa4mrbjc82q94s08pz0990b4pgqgh4als7sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16786,12 +16808,12 @@ elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; - version = "20150521.2345"; + version = "20161106.1958"; src = fetchFromGitHub { owner = "wamei"; repo = "elscreen-separate-buffer-list"; - rev = "1aa66cdbf2b1dc87689725aef004a29bb79dd0f9"; - sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f"; + rev = "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e"; + sha256 = "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f5e5c8e2cd45a25e47c74bef59b9114aa7685eb/recipes/elscreen-separate-buffer-list"; @@ -16828,12 +16850,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20160523.528"; + version = "20161104.1831"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -16933,12 +16955,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20160824.1308"; + version = "20161102.1605"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -16958,8 +16980,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -16979,8 +17001,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -17000,8 +17022,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -17101,12 +17123,12 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20160609.539"; + version = "20161105.855"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "9ad372808ded188b8741e7e6864f88e170232be1"; - sha256 = "0if1h4vcajkhjy56d5zili3i2bvgxhhkhhgf6l37bnnly243zr3q"; + rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2"; + sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -17288,12 +17310,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20161002.855"; + version = "20161102.940"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "2fcc970436142b8f4ce4911f2a04680fc77699b8"; - sha256 = "0ncax0vlgdah8mlqi3kr63ymf45bngr38vk6m6q3i2wdx6fbrxm9"; + rev = "aa7e2af7f2a40ae9691d8d8183060c947f4ba55e"; + sha256 = "062s55qhznd04vas602zzgxba3wd9yvx489ww7qjssj4wqgkckb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -17573,12 +17595,12 @@ engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20161009.1718"; + version = "20161104.650"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "5d6c6495b31a8029b5122cfe9790c1c2609dd731"; - sha256 = "1y23yj749i14r373cfymqw6bakqvrsdgyjn91i0rp51y1rzdpp3p"; + rev = "9a1271b0051b9c939a63fa395cda2b5b64c5f36b"; + sha256 = "1nvf7anv2yplfhs4xbvrxdgd3mb41mzv4y1119lrqfvhsfd07ii5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -17682,8 +17704,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "8f3f3f1e46aaeaabd87748c8f89c2bd4bc420dd0"; - sha256 = "0z62lmajsf2f8027lncv8bz1hwpfl2x84l10gx0qs6pdj59x1c5a"; + rev = "0dedd95b8e9ad09be9521160a7893eb58514c992"; + sha256 = "1xsbw32fysl3pdxbnczdgczbrhl3qqghgk5mcbb1j4a7rnp4js3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17788,27 +17810,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "20161028.1231"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "979cb9cd6143a3672b4b175073ec3a8cd22d3863"; - sha256 = "00xqqnvp13ipbw1ilx42pb670z2h8rlvdpwa9cirkmvv8c54wkji"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -17938,12 +17939,12 @@ erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20161029.2101"; + version = "20161105.623"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "2d7e5bec956f17203b916772a980c8115d6c70d1"; - sha256 = "0k77l8mj28c0z5d9wq07sblb4w1z0asy0vdxpl74n6r68sr66y57"; + rev = "d30f426b4cae10efcb91ea57afa9cc51feb4c39f"; + sha256 = "0r9n9jhd0sbf1mf3mzizaal5kqd20msm20vl73z589ph2q5vxnii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; @@ -18210,12 +18211,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20160924.1342"; + version = "20161103.1834"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "d673666315075e449b5c555a06ba50ae8cd8cad2"; - sha256 = "1pkjm4dh4ly4angbcnn3cyyyxpc3h38b4jlyx4050nabim13vh2k"; + rev = "af00d57441e6fe92d8f03d2557f4dec0a410e5e5"; + sha256 = "1rgh2p8sz4hcqavalm48dzp1gsnccmc8zd27rv1a4xhaaihw23cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -18319,8 +18320,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "056789659edec99e5500c4508f00460b98d6c73f"; - sha256 = "10p04f4r9qyqlwxlvjcfhblgjh565108bvxxqjqcv34651qdvikx"; + rev = "3e06b82f0f29d90bff0783e7f3d1dabb435782f5"; + sha256 = "1i6zjj4pl5cdvqxv2ghcm0dml3jdm82hk3yp4l20zs49i1j3f43p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18458,12 +18459,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160927.1351"; + version = "20161103.1024"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "b2e4403197834c06bf47a9b72b57a65a28589fbf"; - sha256 = "19wzyc8qxdgm69k3nrv6x1yi3lajyxp1xhm6w54x14yqw2l8d67g"; + rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992"; + sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -18836,12 +18837,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20161022.447"; + version = "20161101.215"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "c5282d4dc4d6fc07155e694d8a0f33e100c7697a"; - sha256 = "1lywwy0lhsjdd5sxm1i69np98l6y1ya3s44ga8fkm2zg2yl72wcb"; + rev = "bcb5fff9e9fc4f17f780149c6ba38002ce044176"; + sha256 = "1h3jlfblwsrqzw98lw4dq550zidab1f6l557fdcjkqlgjf74c4bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19316,8 +19317,8 @@ src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "77dc58134233a2e044d0a2d4a5abc46c28470850"; - sha256 = "1k7gmivs5dpk672hjxkkpjlxzxd69133rkdchrhjk95nz0sdzq0b"; + rev = "69fd9db21bb2a281d5232d45555714b195825043"; + sha256 = "16g7322ib53cd8f12mqw25j77g0q8vivnc6q483i5kvaivnbqvd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; @@ -19337,8 +19338,8 @@ src = fetchFromGitHub { owner = "bmallred"; repo = "evil-colemak-minimal"; - rev = "334a1809ac4d3af3aeb8a18ca05c96c0c6ea6ad1"; - sha256 = "0608vcj2birsfm12w89gnpmcsalcpva61qkhh7m4kxqafglq7bzf"; + rev = "5f1db93959359d3efd57abb5a0d06e94dec92556"; + sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; @@ -19442,8 +19443,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "9c40afed6603bf6367b58fa1ccf8aa6feb66eff3"; - sha256 = "05hshgfkp8lkmz5bky95ky53jdb869w3x3sv30lq7qc6b7qxrjfg"; + rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; + sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; @@ -19753,12 +19754,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161025.1223"; + version = "20161104.859"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "bb6733d5ac08dad8754507c642f6a03f05f339eb"; - sha256 = "1xbkai747ql2kh6g80i35hgfbaqv9is98qxcw6g8zzvl8rrwkh4a"; + rev = "494cbf6fc0eba4cbe7b6dbd3c75add14e2aca63c"; + sha256 = "06ywfq7vwqhqf9a715wfbpvl5va7sj6dfavizi4xjzaysmg8sn29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20047,12 +20048,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160928.508"; + version = "20161103.1020"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "eaf97a09b38024d6bc7d44db5734bad16716c66a"; - sha256 = "1inw88n96wki9mja9xvdfc0qpwffh0l0kjnxpka5636sl7pl4i74"; + rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8"; + sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -20278,12 +20279,12 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20161017.1837"; + version = "20161103.333"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "37fa430eb435ef6a6ac8ac01a6ea0102f5d751c6"; - sha256 = "0g9r9b95b3g5p8wcd0r5akmdxb7vb4wp8fj75dc5v3frgfssd1pc"; + rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb"; + sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -20383,12 +20384,12 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20150630.138"; + version = "20161104.1833"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; - rev = "4e1ad0d54bccf2eddb7844eefb8253440aa80f28"; - sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv"; + rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a"; + sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; @@ -21993,12 +21994,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161030.316"; + version = "20161106.149"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "f8c20f4f986ba79f1e6960d3bc59498e6fb5eff3"; - sha256 = "09ydncdd8jkh22mfdq3ykzrxrscf05ks5dp1x6frv5ybf4dz33ql"; + rev = "f44a5f7d6f0da7f656b6167f566b72cdd7c62dbb"; + sha256 = "0nyp7aw0144klm5mkq21lalma25g0pqs1y2f7j7rv6phg4mmnk1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22788,27 +22789,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }: - melpaBuild { - pname = "flycheck-protobuf"; - version = "20160211.700"; - src = fetchFromGitHub { - owner = "edvorg"; - repo = "flycheck-protobuf"; - rev = "3d4c71b535bb456045e4d0e88d63791dbe2093b5"; - sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8f8d8e4d849400823d738c198665d46fa24d7661/recipes/flycheck-protobuf"; - sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc"; - name = "flycheck-protobuf"; - }; - packageRequires = [ protobuf-mode ]; - meta = { - homepage = "https://melpa.org/#/flycheck-protobuf"; - license = lib.licenses.free; - }; - }) {}; flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; @@ -22984,8 +22964,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23820,12 +23800,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20161013.401"; + version = "20161106.702"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "741a94586651d8f07bbfa939de25e3c2d76444a7"; - sha256 = "15fns0wpvj0lgq3ax14zhqkpfbkss68zib542cppnnl3q88jvbf6"; + rev = "ffd97a5a3663103aa96945bb1d2f03481ab6229f"; + sha256 = "1f5q99mhhcb75v2c06sxbg7psqclnlqci7fjaa484a8hyback24r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -24313,27 +24293,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "20140811.1409"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "3fc6a84d1629f3c219bf3fd4309b2253fdcc99b5"; - sha256 = "11k3jmabf2i5ivb5gk19k2ij3svfzwlwxvrxaby1k0isp537fabr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; @@ -24481,12 +24440,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20161031.959"; + version = "20161103.300"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; - sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; + rev = "cb70988aae85b03a26be9b3e2a70742658ff2502"; + sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24534,8 +24493,8 @@ version = "20161007.2213"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "e9cd20604c557ced77c19393da43a4a0821c2e37"; - sha256 = "1np02migjmwj3l1jajjafw35vqhshkwizdx30kl474c5f5iibk1i"; + rev = "bbcd039c6cb4f73a2e0a262eb32a7d100f4aa40b"; + sha256 = "1rjfzw4l0cykfvj1hlzayzn63iyb818i7a591fcv4sbviqcg9c65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24963,12 +24922,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161018.819"; + version = "20161104.1437"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "ae3c4e653c89dc3455f4cd8e75eb53fe41830de5"; - sha256 = "0lw189b05aq5l12qrb54wm2rw8dvcpw7ryx5ank7kbaza0nmx0mx"; + rev = "e628ab784703410e1451616953fcde9878d00301"; + sha256 = "1al3m9wgqbq3lkqw81gy0h15d4jis392nfdpybf5s0bvxbpfm29l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -24984,12 +24943,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160921.520"; + version = "20161104.1235"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "4544040b3498d7f734ecce251708cd70089cd63b"; - sha256 = "07gh8awa37g7kyj3z44ffir98l5rk5zpk19a59b9s9jmkz1zixhg"; + rev = "3e19cca8452e3461d7797d63511ccb77cfb0e4a7"; + sha256 = "17lmg5qlakwm09j32fpkvwcxfzrkx4l16iiw38lbrlm505qnzlh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25110,12 +25069,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20160728.1525"; + version = "20161102.2016"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "87cd3e9dcdefeb1a6d781a3fad78eaeb6ef2ac7f"; - sha256 = "13wch5vp837nvw2ilcv40j3q9j6dx0j0a3q74g23vy3sn42r8znc"; + rev = "ed4c8a7b3c347c7c6680bd39c7f4ca632030eb74"; + sha256 = "0h5mkjipq9yw2djdq61kwp1g8bgkmqnkmgzzkg0vk1ix7crqbjif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -25156,8 +25115,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "a0ff7155e6a567db5a40a4f22c479b27cba25248"; - sha256 = "1sbx7sx4j9cvi5h004z2hhyaxp2qi1mlxwsfs8rmn5vw7djl40j1"; + rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf"; + sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25450,8 +25409,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25506,22 +25465,22 @@ license = lib.licenses.free; }; }) {}; - git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-gutter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20161030.1851"; + version = "20161105.656"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "0e33154a7d78bd7739fe081537dea49e309fbdd2"; - sha256 = "0q6cx0v2b96abxspx6czahvsccz3rsaqvphrhfv6gn6p1b95a8fi"; + rev = "00c05264af046b5ce248e5b0bc42f117d9c27a09"; + sha256 = "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg"; name = "git-gutter"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-gutter"; license = lib.licenses.free; @@ -25828,8 +25787,8 @@ src = fetchFromGitHub { owner = "10sr"; repo = "github-elpa"; - rev = "2c813e0092acbe2fdeccece6f57d2a95ff85e0cd"; - sha256 = "0dlndpybh166dkjqcbqw2qwqqa9dc8g974nijyas74gi17zw93q9"; + rev = "7619a564edb1985b0487786a3b4ec6d12f897b5b"; + sha256 = "176x0dclclpa6am091f866ybqhhdnlq7jgsik5b5m74dl26bcxcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; @@ -25866,12 +25825,12 @@ github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; - version = "20160702.2112"; + version = "20161102.755"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "7fa3e5fd519711bcc241af73abc72fd0b6c1b3a9"; - sha256 = "0mi2yn6b1vhs4zdwqzyifi20bjy3ac0ycvza7ybvwanbkxb1kmfh"; + rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e"; + sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; @@ -26076,12 +26035,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "20150909.1839"; + version = "20161104.2041"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "f0e23a1262bb683285b381b1d142478ba345af1a"; - sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -26392,8 +26351,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -26535,12 +26494,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20161013.1055"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -26581,8 +26540,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -26665,8 +26624,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27187,8 +27146,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "1a7df5e3b156e6f9a3da8402147b0bb32dc3a185"; - sha256 = "0f14z2yzf76shkwjwfypbdgdrll6mn4m9fm7r15bwrdzm5f72d9k"; + rev = "aac2f2f2927d6a95d507538f70f94a142cd83fd2"; + sha256 = "1vik0fh9hi81d8pai9sz9h3nrn7qkyhp289hd9p8cflkz7g9cd6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27430,8 +27389,8 @@ src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "7798aef2a8d369d0cf6a3cbf1f85d2495969c253"; - sha256 = "1phmpj77hv2f5cq6685r6nngp2c5ssml55w7mdh4x4yji5mndn42"; + rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac"; + sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -27489,11 +27448,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20160317.614"; + version = "20161102.621"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -27840,12 +27799,12 @@ gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; - version = "20161030.646"; + version = "20161103.1523"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gulp-task-runner"; - rev = "72ac9e8b2e69d7348e10003f4b434b7b96856781"; - sha256 = "0iamindbxhqiq8w6rkjway35nv2df347bsfakszzk68ggl2i73xh"; + rev = "f13da9e619c1838571df0a0462c273ed6e76defc"; + sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; @@ -27903,12 +27862,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161031.451"; + version = "20161101.633"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "ddcd81ddcddd1715c8363848bf9d49553a91f148"; - sha256 = "1irg6jrk6wq6gzfbx79993qc82p9ilrs9gnz96hghrk2m8maizaj"; + rev = "24bc54ff2f8756609089f5f48f34d718db629381"; + sha256 = "184dnbg7sddck39qhnydzaa4sxxnz6mcicjb9n1632xlyg6q5wrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28281,12 +28240,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161027.139"; + version = "20161101.751"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "cde6c60b0e511a7e22290542c4e8e5bb9b253cd0"; - sha256 = "0xpp1n8x9359139cndqpmggf18d6y2zlvwh96i0dqwqq3nniplxp"; + rev = "cc432999b49bf9bb8844375436381b21f0344ebd"; + sha256 = "1dgkz5drnkdqm8lbf9d6qh35xlakzizm61yq6qkifhyisxlkg1rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28549,12 +28508,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161029.1047"; + version = "20161106.2328"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; - sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28633,12 +28592,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161025.809"; + version = "20161105.744"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "7a687f97e0ae7cb4cc4520aee9c97f84f2088ed9"; - sha256 = "01bl45i841h8n0ndjyj472m7w3pv0mnzmw8fy9ggbh8rcbhr61wp"; + rev = "34cddd7591e2b68bc91215da8f31036d83525909"; + sha256 = "0yr35rkfidly57fklacvh03yvpb50nyhj3cb0d1yg2xmm6civ5gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28738,12 +28697,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161031.258"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "46285116549fec9933fd035067773f5084937526"; - sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29095,12 +29054,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161028.2141"; + version = "20161107.47"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "12c5de20c8d224820800eb6eaf6be9e2e7ee42c6"; - sha256 = "0824rmbcw3ksdyvm9j2z6r825nshjhqsffj75lrnxsfrk4978cgy"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29620,12 +29579,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20161016.407"; + version = "20161105.813"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "21ae7521a6ea0268b88a95c15c5ceb46851a44d3"; - sha256 = "1vx94f1vx0rj9by74q8gmxf06kjska06l3il4qzpsn2wasky2pr3"; + rev = "b0bb524d6c69d1d43729d68dbd28b67a723a4b90"; + sha256 = "0n7xsrblnl9awvljczg4a6g00bczw47q69fnmqwk76ndigyhx8n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -29701,22 +29660,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "20160321.115"; + version = "20161102.1853"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "469bbbe4c6cdd4c80444ece10f07cfb62fc4f13e"; - sha256 = "0iyfn58h50xms5915i29b54wfyxh6vi9vy3v3r91g6dwlxrjibka"; + rev = "e86914b0469d390f908b44401a31b1825af0b10d"; + sha256 = "1vxfc6dh1dahxvzz5vchx5gj33f8dyz7gqa5j1xcrxs49bqca7ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -31484,10 +31443,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20160617.617"; + version = "20161103.1410"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "1g0csgabcaxfvv92bmqkmyqp2jlal8gj6c6ghz83a2r185ba0jji"; + sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -31894,8 +31853,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "ed127251c80be3c1606913868fea09683ed0e8fb"; - sha256 = "1xdnvfq32pj5gkmwr32wa8ly5968kkibirhvaviy3wq2dzs2qbb9"; + rev = "295246ef496f3f2bff45a098433f171e0350b889"; + sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32196,12 +32155,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20161008.1357"; + version = "20161102.1337"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "a23312464fc6462d559462a44cd74735e9f73421"; + sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -32217,12 +32176,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161026.710"; + version = "20161031.709"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "589f0d36b9bb15665d84f0fc7bb401928d704449"; - sha256 = "0bid6y0nyikwzi1nqczds2p3p7glm7hiwj0mgqfminpyaldvgfi1"; + rev = "912d78a9e211f588fdb59a487d6fae3e13089023"; + sha256 = "0fnd2y0w07k0rz6k3ghmk9jkx2mzdymnizrbx4ykysqdwwwnj4lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32527,6 +32486,27 @@ license = lib.licenses.free; }; }) {}; + html-to-hiccup = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "html-to-hiccup"; + version = "20161028.701"; + src = fetchFromGitHub { + owner = "plexus"; + repo = "html-to-hiccup"; + rev = "99217a5058626d253ed8ada51a7642071fe54ba5"; + sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55a0355077a16f82b45113d37a10b26676f5f507/recipes/html-to-hiccup"; + sha256 = "10d0fafqn6f1mwjbx8zizkc5ql9njs4f3ghplirqy82cx4w8rgbq"; + name = "html-to-hiccup"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/html-to-hiccup"; + license = lib.licenses.free; + }; + }) {}; html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-to-markdown"; @@ -32947,12 +32927,12 @@ ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; - version = "20150714.1320"; + version = "20161103.2358"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-vc"; - rev = "daae8b8cec4b8e572b065e00c8c8a368fd0a8b8b"; - sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp"; + rev = "de75fb3345384fe13d0500435241ca4a056f5fc7"; + sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; @@ -33550,12 +33530,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20161010.710"; + version = "20161102.707"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "7965a00a33155588c55c597db84d89e5eb266acf"; - sha256 = "161sncq7x3flnbqd0ag4fg8yb299qkj5ri5hj451p1nz5s7hibfi"; + rev = "4c70405ffcb54157f43662ed5a561a96e08777d6"; + sha256 = "095l1vv0q5xzvxwksnjl4llj9w79ih341xayx84l45m06s1a8j5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -34021,22 +34001,22 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "20150716.233"; + version = "20161105.849"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -34049,8 +34029,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7"; - sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g"; + rev = "2f764164d0ceb5dceddd8642447b74939d98d583"; + sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -34233,10 +34213,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20160702.1343"; + version = "20161031.727"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0rpkfzsas76qp7a77hf60gkdlisbgcf1apwkkzj2lp1dbkncbx30"; + sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34545,12 +34525,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20160825.953"; + version = "20161101.256"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "fa2c32c7b55b6f7ea5900e89c9a749469501a9b6"; - sha256 = "1slf22a044iirn4p5rw1hvgg1grmhml4rjk4g74xbsg68xiyg6ma"; + rev = "f0707fd914d547e88594b3208a216ddff9664a97"; + sha256 = "0xk62r0fziyybr5ivvl6yyknfv98b60nw66swz65ld9w3ld8xlpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -34836,12 +34816,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160925.1030"; + version = "20161106.830"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "4b63b809c9643b90d396cbcc1ed0a53659888f4d"; - sha256 = "1mi838x36wi2jw4i64hcdlfi2ji76sqr5v832h0z8x2in40zrckf"; + rev = "bfe703a4c0e91a960c606bf2420b1f118e53a0a6"; + sha256 = "1dy0as8n5syf4cbpdpw7fpd205jzkj0k7av1c73nxvd4zd28pxj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -34898,10 +34878,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161030.1449"; + version = "20161106.1457"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0jnch3c9zhil6k4dm4qgqf896vrmbfg7dlhqivlq6iij4a9mzjpg"; + sha256 = "0bg6cy0yksklb929xxrpb6qyzkfbix7d5sgl48hfr4am0y3qgqi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35128,8 +35108,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35145,12 +35125,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161031.258"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "46285116549fec9933fd035067773f5084937526"; - sha256 = "0vx6i1as0mxlzgzk183dg71wj6y693r1fn5j6q3xbhcpglz1f19q"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35212,8 +35192,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35416,12 +35396,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161028.901"; + version = "20161102.1441"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "b944e8e88a209a15d3a7fc163de3345d9dd8fbf6"; - sha256 = "023j5majib0xb2xi8nk4grflfrwya8g1sxvrdp4qa3md5pwp9nfs"; + rev = "87697c66f883f07ff3cf646ff182a7edb49b957a"; + sha256 = "0cb17p1g7zm1cnxzfb520v7v430x01df0s6g8xi05y197kd99lbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -35752,16 +35732,16 @@ jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdee"; - version = "20161022.612"; + version = "20161106.1043"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "788a75abd2df6bfce1073cdd2c39ccb58586360b"; - sha256 = "0iycwrcj4r9nncikl9hrqjg6snwwl7q2nv2x4fixzkkhs8f9gyah"; + rev = "28fd7e8045387c4abeecb73623afad366417de07"; + sha256 = "12qj3r7apylh0qccqsr6lqlfbrp6xz3hpqrk2gqd3b01j0hp4cwd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee"; - sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; + sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; packageRequires = [ emacs ]; @@ -36253,12 +36233,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161025.649"; + version = "20161102.1108"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38"; - sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b"; + rev = "5633ee969c4644bde96c7f4134b02de463f910e1"; + sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -37300,8 +37280,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "08ae6e1d290f40cd7649629436372ee6a52a7735"; - sha256 = "1bzbrwpnzwbym8y17m3298nnl7c3fcb1ib8689618jla0f74w6qk"; + rev = "e66f76fedbe7b8c042bd57eec282b6e1a88cb492"; + sha256 = "04w9gsip1h8qhppmw4g42apwnqpnfx8rcxgjvlskln97fgpf083d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37611,12 +37591,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20160801.753"; + version = "20161103.932"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "564e1454f1b1fe436494f0cd9fbb78a889fd2969"; - sha256 = "0fm8zlc27m22lfa2ay81h2s5aar0vyhfhwbha3nl1wwdi9720w0f"; + rev = "28ec20825e266723a5a42a630d865ae8fdfab3d4"; + sha256 = "0kc0l07c3zq48mpjkqj7sbpz3j3h5bx4z83r7954pj6s4za8cqmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -38930,8 +38910,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "7e057dcd4e19ef38ea59c2dc00fb13bda64c5ecf"; - sha256 = "0i8n2yiv3bw8jg5w2lzdhj9ycklkpwmvyxl4swcsslc8mp56368g"; + rev = "3e6b5bc83fc2b89b0d3624c3ba5d36af162a225c"; + sha256 = "0h1flxwsd83hrgpjz4z4plarvcvmwagvqxfpz3k05hi75c5cpcds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38951,8 +38931,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "b11fb74be7e5f465a2fe505e4d44cd13ec9ae136"; - sha256 = "0v0v036hq0qxj0yybr1fpsfkl01750nvl9q3c0sfiis9ylpqgzmq"; + rev = "8280df5ce6db836559a5c2442b97a2f02b6f7a05"; + sha256 = "0jzq3vpdq5cw5nh2l2pvj0y3lnvjff2wyy6ip2z9n6xcjjdnzki9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -39300,12 +39280,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20160821.1216"; + version = "20161101.1340"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "33097fec0d32145389c6ec8c407a1b706c8e77e5"; - sha256 = "1dbvnm201i1vdaygsd846c9q7ykn3yh76b46ni0jgmfcc084cxq5"; + rev = "d7596990cdd197d3db682c4b2ca5410a4b522574"; + sha256 = "1sid1k2vv3bawsirz11apslhx7f5dfva4gwcv7q7p3b0zxlyw1f1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -39549,12 +39529,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161030.317"; + version = "20161105.1602"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -39577,12 +39557,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20160624.2254"; + version = "20161106.1441"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "17c3aa4f3b2ded6c67b9ae593bcd0c929631c940"; - sha256 = "0ra9g2dmpvii0pdwv5hmx4kr0m695ry5msnsyc6lvzrcc9hvmw5b"; + rev = "aff3aa6f46f561e1cfe4f240396559097a409fb1"; + sha256 = "1mvg5qk93b7ihy7jbk6ywwp2a00qz7wwz3rd2basxj01z6glfxk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -39728,8 +39708,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "63e2c3af0d39530802dccc5d23df293753947a6c"; - sha256 = "0jsa78hwhmsc0mx4d8y6snf8drv0i9xw3cdg9i4dnrw4p9kjx2mr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -39770,8 +39750,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "9d13effdbc213a0c8dcce78e1825011631fa0652"; - sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -39791,8 +39771,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5"; - sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -39812,8 +39792,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0"; - sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -39829,12 +39809,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161024.1527"; + version = "20161105.1817"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "43bff16701daac38fb08c87bc60874bb4b1220f4"; - sha256 = "14r88xh3rwbr4kns487928pbh48mdwyg4qhr5wzj6yqb3kj0816j"; + rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749"; + sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40144,12 +40124,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20160626.1924"; + version = "20161103.115"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "1ec88c8da5f92982566d58d5c4ea743317977506"; - sha256 = "1l3h6jbcv39pslknp6y56pvx6kf0brbgrzlhmsc22n4238294x2z"; + rev = "9c32e47b80dce357278f520593eb670abb66879d"; + sha256 = "1p5i26bcsa9vp5hapy2pxkb55yhqyhpmsi9qyqhkh9bxaqa70baf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41599,10 +41579,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20160719.1606"; + version = "20161102.1111"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "195dqyjgxv51lj1779w98l7p8qhr8aa87w0k4dqawzfap2mms85h"; + sha256 = "1d55k9x2x29s0n2pkvp9lv8lbbha46f349dayniirspi55r89z02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42362,8 +42342,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "c941d44c994e29f0c5f6c4532950eaceec0a6376"; - sha256 = "1wrdcxdlcvrhvarz71a09168bp1rd154ihs5v55dgh1sm7pv34la"; + rev = "63056cb9b29c5d3b5ef9d22ace7633c87e1e4299"; + sha256 = "1f4ijffjpf9p1p5gvbv8yd9hiyqrdiyg4wmqrnr76yls7zbxdf1a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42425,8 +42405,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "d87954bf3791fb871c6e16621077fb0b97cc10a5"; - sha256 = "01rx4ll6qdlf3qf0f3srmid24zsifqbvm43nqy7k6glnidv8fcnn"; + rev = "efc1eaa4361add1803ae5245c4f3dfdea106ba48"; + sha256 = "0ws529sh9xa583m8gk78gwqnz2704sz0dw9c0l9nfz0hk3h75ivk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -42733,12 +42713,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20161013.156"; + version = "20161103.1715"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7"; - sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh"; + rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35"; + sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -43294,8 +43274,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -43315,8 +43295,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -43336,8 +43316,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -43752,8 +43732,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "8818c5af5598e16ea59189e1e3245f0a3d7c78f0"; - sha256 = "1ky63jyxdz1m6fcz3phi87mwc0ha6bn2fpg4lcdzp0w8cp8rc8ad"; + rev = "2e74d2bcab9ea91078f0ffa040ad8d9372e0a305"; + sha256 = "1n6gma3g08wvs083frbb0a7nygy5f9cfidqkbqf1xxm806ancvdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44046,8 +44026,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "6a2b876d3ab210c0c4e61c6f60d34304e024b54d"; - sha256 = "1ypi182ffr65vixg5va2bcgga29r9jxa8w0pv2cpilbys8w53hpd"; + rev = "b7bac03427e4f13ec7681aa25d3a1111fab7a4c3"; + sha256 = "1sga2iqm3qf4qyvxm89maakkxg4dskwy0m5vfa54b95jr8616p5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44088,8 +44068,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "18b7363a699c0b5a4bf59d2b320dfc2b84dc4e67"; - sha256 = "11g99aw84w1as4can3184ns2znwg7knp8jnp7y3halm0bw1p1s63"; + rev = "eec5409a69054cf21214c3f5846ec0310fcb8228"; + sha256 = "1478xf9mp6v539r6mgpm7lfqa21xa5vd1kwybm24bdnzlq7h5pws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44354,11 +44334,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161031.410"; + version = "20161104.851"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "429c30c2bc6587023f234a8a801f9ad5ce7076c0"; - sha256 = "1p8qv1y08yychsrmf3f3qjyiiisgjvd4h1slhn3zyk0bhif1xqvf"; + rev = "343534d82dc8882b3f0e2a847ee9d10ba5392809"; + sha256 = "1gq6vj6ac5f2kxrmzh8szn5577znfaxmp9fw3zcfjdrdmw0775n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -44627,8 +44607,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "5ad24b20a59754f0673adfd33a323bde9e3a1ae4"; - sha256 = "1fdxwlih732ci2xpvk90ri35n4g3rjh91hs001j3y1c5ilpcp5cg"; + rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34"; + sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -44731,8 +44711,8 @@ version = "20160310.1353"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -46184,8 +46164,8 @@ src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "dfa1aa2f1b802819b8d6baaae4ee1a43f2fe925a"; - sha256 = "1whvqh76nqjmihgph2n0lasmvgb2zvd1pn98wyb3rw0h4hqyhlx3"; + rev = "fcc653735faf1ab018273d7821981090f752c838"; + sha256 = "0x8mfka6m5452r5sj7m6ypvd91cqqgyxb00rx3v8y6wbpf2nsrc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46642,12 +46622,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "20130423.1545"; + version = "20161105.719"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "df319441e528a0cad42d29e71fc3547a61dde1c5"; - sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -46917,8 +46897,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; - sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -46937,8 +46917,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "82c98e3caf565417a8fa85d1d388d7b1895920a3"; - sha256 = "0q79dk2p40dg0w369aplmghmfvq9fjkpss7s1d27d06xkf131k8h"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47088,12 +47068,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161011.106"; + version = "20161105.1652"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "5ed6b514351132c07d65054cdfc9b3da747a26d2"; - sha256 = "0707y3kw9snmj4ba2v5dqwgr9fyd50xnpdxabak1jy89ckcgahxv"; + rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d"; + sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -47169,22 +47149,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "20160822.2123"; + version = "20161103.2316"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "21956fa2276761c1ea8f70f4e731bed10a8e560d"; - sha256 = "1viviyklv1cipa2n37n85kfmm3s2jlwgyh983afmj3b8jkz8xfw2"; + rev = "a68ef488404f175d8b8867ad958233f927e451f1"; + sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -47283,12 +47263,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161031.813"; + version = "20161107.323"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "c295ff00ccc9e29a04c981cd2631d7428b5e5e63"; - sha256 = "1jbpnlli0g2kbsqrl3miwfjhfjf9zz9dlhbqd9fi891khyy5c6hm"; + rev = "40b1c4322903b30b9c44906093f3ad73f7fba142"; + sha256 = "02hm36hkcsyjp28idrsfz52imjaig9qlwsamfkww0fqf9j5vp0hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47804,12 +47784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20160801.715"; + version = "20161105.857"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -47825,12 +47805,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20161008.1359"; + version = "20161104.1800"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd"; - sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn"; + rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; + sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -48375,8 +48355,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "8e7eb1ea80d2f11f7fc7e70e7418f79905dd00c3"; - sha256 = "1dbk37x5aaql03y97daqvw7nd70bym0cn93rad9m81djnhg46li3"; + rev = "6f9cf1691cd8e597f3c6ca20ef299d5c62c9920a"; + sha256 = "15i877mr3mwzh44dzi1y4rx86kkx783fg3lai78vsby2c7jd0w42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -48560,12 +48540,12 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20160702.145"; + version = "20161101.1920"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "a66a06fdc0c705f3b55d4d533c5c07097fa2f28a"; - sha256 = "150vhknzjhddwy8fw4p963ship96rbgaapkh4aq1193q8hanspzl"; + rev = "973bb43495213e883383cf263ce173e36e09fb66"; + sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; @@ -48749,12 +48729,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160915.207"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -48875,12 +48855,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161027.1828"; + version = "20161106.718"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "e7c411ecc54445a62300576f83e36ce552d592eb"; - sha256 = "00mvszyfyw08d16qy3nm125z71jd35j12vhrznvc2jcz17pgnnw0"; + rev = "46f12c815bc791b2889292d4b32eccad9e313d1d"; + sha256 = "0dvljayxc9dkrw5w0xj92859wvh0kmvq1jl8mgf7916nafxgl0pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49166,12 +49146,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20161027.1129"; + version = "20161104.1521"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "2038ac386a20caec6f5a6477fec253f186c17715"; - sha256 = "00yr76pqcizxpi0p3a9r5j9fgfxf40srqgfpvdhbky63xmnq6ckx"; + rev = "88ad7ea08afae0bf062755bb1e91c5543aac6028"; + sha256 = "0vjxlbm143i9a8pi5v2q82fms8lwf1i24nddxj4a1js2r6mpz15m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -49229,12 +49209,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161020.1842"; + version = "20161102.1351"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "df7340518e229c42d2ea5decce8ca750a9bfa762"; - sha256 = "0w23mqd0s3fdcmdwnwj0070gabqbipwwbd4h3f663zp200xrnyqs"; + rev = "b693226ad827409fc1d6243a5a949d1c87c53104"; + sha256 = "050ygdhlxd7785h262vg8pdv2w0sgq36jh0wsjv9q64qmrndrklf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -49374,12 +49354,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161025.845"; + version = "20161101.932"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "b593725f5e6ac5c65866055df75b39d0b5fdc1fb"; - sha256 = "0d7ipf558141gf0qk82rvzfffmfa4vzn1yha0hza2fx8c0icv38l"; + rev = "fb9e9f94a8010d2167a03ea6b58a320b0925af10"; + sha256 = "0zwv0r8jzb27gnv0j4n9xxylzk42sg6w6ljvdkx9nm2qgrfq3nsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50208,6 +50188,27 @@ license = lib.licenses.free; }; }) {}; + persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + melpaBuild { + pname = "persp-fr"; + version = "20161030.159"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "persp-fr"; + rev = "00db4a17977b4e9c5c3212ce94fbc106f24d9d81"; + sha256 = "0m70wawbxm0kg641qj6sdsij5d2icmmad2p977c8qpcc8qh91gs7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; + sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; + name = "persp-fr"; + }; + packageRequires = [ emacs persp-mode ]; + meta = { + homepage = "https://melpa.org/#/persp-fr"; + license = lib.licenses.free; + }; + }) {}; persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; @@ -50694,12 +50695,12 @@ php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: melpaBuild { pname = "php-scratch"; - version = "20160730.115"; + version = "20161103.1517"; src = fetchFromGitHub { owner = "mallt"; repo = "php-scratch"; - rev = "755ea9dbc21b55329255967def2426a0fcbca597"; - sha256 = "1vnlv2amhh05lj6sxaq4l4hxv1rjjm7sg9j5b04g2dl22jdjv4ww"; + rev = "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d"; + sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; @@ -51093,12 +51094,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20160620.109"; + version = "20161102.1954"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "d87ff625e280c017d0fb6cd3c141ca6dd0bf9c29"; - sha256 = "0ijqgms585jp3b5l95dk30g8yjfffljk8i3rgf71wrdvcsinyicb"; + rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf"; + sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -51342,8 +51343,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "0d6986cf21b19174b6591399adc1dfb670828053"; - sha256 = "1xdjipwwhgvi38bw514hfd59r80dcg4jhm69ii4v06kkybfgz3wy"; + rev = "f837369264c119d0e96c9ba6e5960deba59eee73"; + sha256 = "12mxyg47hsgzzvqv19qlq9yhhryam62k7adll1i9n39xi6as13py"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51881,12 +51882,12 @@ powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powershell"; - version = "20160210.1858"; + version = "20161103.2354"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "0e51db56fddcafcfe0611142ea939969673c2b58"; - sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b"; + rev = "3c09e1b87064bedc065e45346fd4c3e051eeb0f0"; + sha256 = "19cq6n8dhvr2vw8nx3f4dkybqs9dqa6ss3z2ycql8rdmc5wg6jpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; @@ -52212,8 +52213,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "a2d1af72b97c7cad0b601b80ef36d242b34483d1"; - sha256 = "1dj2dx7vvvwg2839gy4qfr8kmlvzjs7n8xwj21vmxr6fqaa7cy3p"; + rev = "e53e1ba0d8c5081b4671f4292b164e919d0fdb2b"; + sha256 = "18xbql40myis77lyjiqq3kdsp0961iwf4rcg3c9i5w49chw3ql85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -52394,12 +52395,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161008.47"; + version = "20161105.834"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "44f75e3ceceeebac7111954e6f33cda50d4793d5"; - sha256 = "1av32m99fczdmilxci8r8ni73f3x4kmvm99jjjjx4dnpg4siv35d"; + rev = "b573b0656f9fc4c1afa1275c3e3d9ca9badda7f6"; + sha256 = "1frirasi53apys8jhff6ywlbl8h77nd5z2z9ir3jjb9ysrsk7kmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -52734,8 +52735,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "8fcd24b8dbba46748a9d880a2372736a8b1a6852"; - sha256 = "1kjd21k1xikzq5zm9ybza8qgf64xa9yg44pmhinidyx1vwdhz364"; + rev = "0d7199edc802299bdba39400c04f119c7db82667"; + sha256 = "11jvsdkbxlpdvli557d3rydn8hiyvrpxa0cc4k02yi2pf2hmqkdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -52940,12 +52941,12 @@ punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punpun-theme"; - version = "20161029.1305"; + version = "20161103.147"; src = fetchFromGitHub { owner = "wasamasa"; repo = "punpun-theme"; - rev = "064e5d10ece4298bb5605259e4558421d0097caf"; - sha256 = "19dbzrn7ghrxnvir65x4zmqv1yr7rcr35z9ckgy564nwnp90v2hn"; + rev = "cce8b10b2df6f9187a9eaa0c3f21ff0dda175968"; + sha256 = "1iz1qc9bphl2y2z7abc33fvyaccj733drkl7nzbr1jlpbknkmk2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme"; @@ -53447,8 +53448,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "3a83a093d14d59d5026c0beae6bf025fe6b4ded7"; - sha256 = "1y9dpp52xyc7aqqs3mpbi1qn661sgi2f899ppi495wqvlr06fpjm"; + rev = "21ecaa744484218be5c89c7108771465425542bc"; + sha256 = "1l41hyc17vlpfdnjp2bvkirfk12paabs1qwvc03x29ibylw86a23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -53590,12 +53591,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161009.2250"; + version = "20161105.1431"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "a4295abe5e9bc115ffbdcb332266abbc51456ba8"; - sha256 = "1jwg3180ixkhbqv5zf4g9557mcxxsh2ls6kx2vs5m2w95pd9mhdj"; + rev = "fdd052ab2d70e0acf2dcb25a5a94cf52f4c4123d"; + sha256 = "1pdva6a7jdi8aw1q2k32n0kagkldjh8fkapjdmn65rs362nqj7iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -53947,12 +53948,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161017.1829"; + version = "20161105.1637"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "05ce76e8e331d37755b25ac7ac23bfb75880c880"; - sha256 = "1vvaq76jahayx3nps9mz96xz47rnq8dfxnxmj8w5j1mv69lkhxlb"; + rev = "4d5c6332d24ba302913606fde3feda6abaef2ea9"; + sha256 = "1qnkb9z23diyvkkhl2q00yvb8sybpvphlfchdyzsrhylixnkq83n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -53968,12 +53969,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161029.1105"; + version = "20161101.1859"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "7b0b8185a12491897c9c6dc83fa5f20c90a67f22"; - sha256 = "1bwp6z2j3ppvv83cqrnan489xcw75ck48y09km3xpngr5d68ph38"; + rev = "ab625571837c96446e3704febea48b453787c5ce"; + sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -54052,12 +54053,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20161027.1033"; + version = "20161104.550"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "d531e5523f35ee937f25931ea7c0dbf712274840"; - sha256 = "107qg9k87caz9kdjsm0q90g3dnnlkm9m6fincvyz0rb45ns2iq5k"; + rev = "b33640716d0d9930b09e671d2c62c5839fbce210"; + sha256 = "17n1fd9hjqalxffhjfzr08psarcc7ahsi0ns6clx9mwaq3fycg5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -54959,8 +54960,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "93684fa8ad3dc16b3e298386e857fa822ce7a36e"; - sha256 = "1biwpmv51i5vnrv8m6j21rcqscdzvwryf0wrnx1s13ql5cq880ca"; + rev = "bd962668615abcc48b4797168e948dde62b3f197"; + sha256 = "1xz82h933dxl2bj90l24h50qji4h1ivmnf657yp89dbyc42fz7zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -54996,12 +54997,12 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20160516.1416"; + version = "20161103.1157"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "d62dec07400e47ac3e9ef0c045ede916f1025a82"; - sha256 = "1c9ngm95b8rqg11m5w69031d8lgyvh9xpnr4h5r6yyg7836hdk2v"; + rev = "ac8b213cf3dbd43a86910a152426b14576fbece0"; + sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; @@ -55038,12 +55039,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20161028.1638"; + version = "20161104.804"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9582e47507237dad3513bc6957b35abc432743cc"; - sha256 = "1bcm26mghknp749b3n0v4w7ag3c2q2g30d3j1zypslxcwgllzxs7"; + rev = "a83ddbf79abb65f5cfc98d9b19815727e2395b91"; + sha256 = "1kciixx40pdd9vlzd54hxy43adk9bhcga23m2lim5q2fdj9qbyir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55928,6 +55929,27 @@ license = lib.licenses.free; }; }) {}; + rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "rjsx-mode"; + version = "20161105.833"; + src = fetchFromGitHub { + owner = "felipeochoa"; + repo = "rjsx-mode"; + rev = "66086b6557fcafacf9bfdd80140e7dde4daac266"; + sha256 = "1y9inxk3kr8cygi8rnj4dns7azq1ka1yvvj7wsm6hnmm1i3wk3lx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; + sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; + name = "rjsx-mode"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/rjsx-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -56145,8 +56167,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7cf1d49d9090449c660d024eecb782d3d4fd6aa0"; - sha256 = "1zdmpspghmhrizz6zrilysh0x6704dpg2q0r33h27hhd1lak8091"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56207,7 +56229,7 @@ version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56534"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56287,7 +56309,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56534"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56514,12 +56536,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20161025.1042"; + version = "20161031.2109"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "01ac5d8197658c21412acde16df7c39325f03e4d"; - sha256 = "1pylp3xjj9asnnilx1rbghpqgmimvk74sz8fv1r341rlgy1arxrg"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -56875,8 +56897,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "9e4da33eeebc1a1dee09772d5c2fc9ad13519deb"; - sha256 = "0z025cnb4rfw3gcm2897245hy8png76ax035nmcz5hp4lhsk11l6"; + rev = "54dd1b77ac33ade3efe7aa8c78f9915d850f12c3"; + sha256 = "12m86z76a157sfg3y4grizxii0747w3wxv1szlfnghqdkgc1qx69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -58573,8 +58595,8 @@ src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; - sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; + rev = "6c58337f2b7dbe9e58b5e097b1567f046a01d071"; + sha256 = "05071n96d91q3jz9dwp1qkqwq56k0d7cd1pnjj4jvjx4kb852waj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -58632,12 +58654,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20160930.805"; + version = "20161103.1219"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "b48bbcfe9a59941cfcc7e4a31200aada18ab9e05"; - sha256 = "0gp39ay1viixk6x5hnaa09c73vbz8xx453rnkw79pqchhsnyh6va"; + rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; + sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -58924,12 +58946,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161026.857"; + version = "20161104.633"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c2ac34937ea1ec6e8552405f1b35f2523a0a0a3d"; - sha256 = "0s9c067g8b17njjxg31abx4zklfy6azy2c7dgq636pdql06fbv17"; + rev = "c87637c799b19e878d65f1a6906c93b74ad1e3cc"; + sha256 = "0qqp19dwz4vbz83pkhhc5xlwqhq482v2dpmqgq1i6lh42m1xkk5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59008,12 +59030,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20161012.1531"; + version = "20161102.711"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f54b0c445065ba42f8abb8519a44ba2dadd9a68c"; - sha256 = "1s015n4z7mxbw1dv317v7w3mdl0z6p0xwcd20a5prz6yk78yw0gk"; + rev = "14f2502cae166ea5dfbab82a04f9fbae429a211b"; + sha256 = "17f40bam7v1p5ypw2vd6gbzgbmz9jswy7sqgs8xac46ijn4n62w3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -59676,12 +59698,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161029.837"; + version = "20161105.1503"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "78a0880499915b52549aacc5de473c6ecccec88a"; - sha256 = "1hfgklrdjlvx3sfnamfs0wv349yy6166x8j240xjsf24gl3yh4jh"; + rev = "5c680283c9af6d2726bbc107508cbe85a978b39f"; + sha256 = "0fwmjqgcj5q5g035zf4sf36r1ghgb8zb3xqx3a4xvb6bzmzrqa5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60032,12 +60054,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20161026.1857"; + version = "20161101.1909"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "d8012ab4661630283c4ac6521a094cbe09ea4707"; - sha256 = "0q7l82zyk0ibk4hby8m014qfjrpyjp15n92p2j3n7hp9fm8fij8z"; + rev = "9a474fd2c8c17c330d02ba2ee32b543c80d55e2e"; + sha256 = "0dig58in7hlr2mq1j0lrpszj9y1amgwgnq99znd2zjkw80cpvv7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -61268,12 +61290,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160917.447"; + version = "20161031.2219"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d"; - sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh"; + rev = "e94c9e70ba64d231ff538db54acd4b5ecade3ed7"; + sha256 = "1igw97v0779gnk9ymk4inqmz92kkxdim5hkdhm52qk03kn7766zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62032,12 +62054,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161021.2159"; + version = "20161104.1314"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "3bca9f0d011dde62936daca4feaf51070bf86e07"; - sha256 = "16hi592ibxshrmai7sj73d2fgdwsr9131y9gz67kb6b1rw7pbpjv"; + rev = "fd78622bf70cf70c344513587805538c259ea45d"; + sha256 = "1bjybkvydazanwvyp5hmlrpbcyhw8bmw808ym1gavb64qzsswp2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62408,8 +62430,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "df9ad89bec43777513b3f0efe031cd81dcf47820"; - sha256 = "1c1dnflfwj7ak3kvrnbp02rp90glq5gkc7c0kq2a26d2wh9gi8z6"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -62530,12 +62552,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20160125.1601"; + version = "20161104.1755"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "4b8f0c335a6fb055284773dfd480106e8c82fd81"; - sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3"; + rev = "87dfd1e2ce093d53c0919dac7899bbf06bd96224"; + sha256 = "1ln75xg05waxahbaxlvb6vj7yi3svnni2247dzc9khi99dnwlbhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -62757,12 +62779,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20160525.1914"; + version = "20161106.1611"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "f93b2f4dd59608eaa10ec1d8f32484e6476e7169"; - sha256 = "1k3lh920p62ji5n5bvgxcfr6vc5ljssn9j0n4zydhh6ybk9j5f9n"; + rev = "d30f58d713fad72e8e8bfa92d6b2ed5300dbf022"; + sha256 = "011n5285c2gwc3i0cxnhk5g867d1jvga6ck92y787xjxm2k688kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63302,12 +63324,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20160302.1515"; + version = "20161105.840"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "5c0af25f193b72dbb8dd2f9c9cbadf7f541e0c77"; - sha256 = "0c5h3i2viw9iryx2hfmmi0k30y96kqn7vhkbv76fzkhzby5r25fy"; + rev = "44f296e6a16afdde97927c170c6dd0cdb3a3598b"; + sha256 = "16zjijz9syzbcxq1d4bx11kagxwhzygrlgdqvb443cch5s70n2n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -63386,12 +63408,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20161013.127"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -63467,22 +63489,22 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: + term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20161003.1428"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; name = "term-projectile"; }; - packageRequires = [ projectile term-manager ]; + packageRequires = [ emacs projectile term-manager ]; meta = { homepage = "https://melpa.org/#/term-projectile"; license = lib.licenses.free; @@ -63537,8 +63559,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; - sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -63558,8 +63580,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "1b059a9fb324edf0804a9414cfabc6e26c813398"; - sha256 = "1w6698jxjimsiphg00lckxh7a7507piq785bxqinw7ymgglnfp54"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -63761,6 +63783,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "20161106.1243"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tfs"; version = "20120508.1120"; @@ -63881,10 +63924,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20161004.640"; + version = "20161104.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0p0sb5w646vlc623nk7qajfmywn281kabwaa8ha3la39a6sdd1xh"; + sha256 = "0n738nry3iska0121xzwvnlmvzpvmzds7xg3fxh4vk3z3czpb5rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -64024,12 +64067,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161004.2019"; + version = "20161103.1005"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "a8fc3e8223a40243616347e875cfa1151be9a794"; - sha256 = "0nvdz0v11baxsnhhi6hmv9ikrxgi0a4351r787plrdb2qz7zpmrl"; + rev = "74c8be8c72cb7fdbdcbfda430d4d283bc32e16dc"; + sha256 = "1p6nc2rjggvf3jfsffk9danm4ah9lxhj2z61p267pb2mjs0ywkvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -64060,6 +64103,27 @@ license = lib.licenses.free; }; }) {}; + tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: + melpaBuild { + pname = "tile"; + version = "20161104.1737"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "tile"; + rev = "2e0bb114d8cf9276ee73f616cae0a3baa64fbf5c"; + sha256 = "06kc90cy5nq5w87f253a70n6r234lq5kw06m5yb19vw7ph94bx9c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile"; + sha256 = "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv"; + name = "tile"; + }; + packageRequires = [ dash emacs s stream ]; + meta = { + homepage = "https://melpa.org/#/tile"; + license = lib.licenses.free; + }; + }) {}; time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; @@ -64168,12 +64232,12 @@ tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tinkerer"; - version = "20150219.2249"; + version = "20161102.531"; src = fetchFromGitHub { owner = "yyr"; repo = "tinkerer.el"; - rev = "1125780d1fba0330435fcbe943716032ed543a57"; - sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2"; + rev = "713769e5f5eb90a87d515b7ba2dca71f2f297218"; + sha256 = "1dpf6s1mv8mvcr84hzawhjgz3fjpbr8qrlcvdsw3r2c6b9pdi4hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer"; @@ -64735,8 +64799,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -64836,12 +64900,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161027.848"; + version = "20161103.1632"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "6ea2305e267e5efb42bfa2187279ea3b7d1a555e"; - sha256 = "0p81gdrbwvba7xnpapgwrmssizkfj4rwxxipr76c4lzdmz1am03w"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -66699,8 +66763,8 @@ src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "a3a7fa4a84c6117e618ed771c7327f413e1a021b"; - sha256 = "114jyzx6asxr0r3xqi11wz10aij3h2rpyk9ga5xwzw47f7sayw64"; + rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052"; + sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -67091,12 +67155,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20161026.1359"; + version = "20161106.125"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "a332f96c38a512c645c110c04f4a8315429bd2e2"; - sha256 = "15284r6hx96mwjigw13ikzqjm9irj4vklwsikawym37dyz75h4nv"; + rev = "e3b27f4f179002984643895292bb207c3e221a5c"; + sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode"; @@ -67109,22 +67173,22 @@ license = lib.licenses.free; }; }) {}; - voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "voca-builder"; - version = "20150625.1133"; + version = "20161101.945"; src = fetchFromGitHub { owner = "yitang"; repo = "voca-builder"; - rev = "cd74c13e005e33ab125d43233b1267a8819b0abb"; - sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw"; + rev = "51573beec8cd8308477b0faf453aad93e17f57c5"; + sha256 = "1gd7zqmyn389dfyx1yll1bw5f8kjib87k33s9hxsbx0db8vas9q6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder"; sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y"; name = "voca-builder"; }; - packageRequires = []; + packageRequires = [ popup ]; meta = { homepage = "https://melpa.org/#/voca-builder"; license = lib.licenses.free; @@ -67359,12 +67423,12 @@ warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "warm-night-theme"; - version = "20150607.741"; + version = "20161101.728"; src = fetchFromGitHub { owner = "mswift42"; repo = "warm-night-theme"; - rev = "67cc2a1591c0627e6310cdfe8ca7c8d4565b9c16"; - sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif"; + rev = "020f084d23409b5035150508ba6e57c2509edd64"; + sha256 = "1jmjyx06p0cvqi1vlg5px2g965q9pgi3j61msxjf5skzw53vlc88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/312e3298d51b8ed72028df34dbd7620cdd03d8dd/recipes/warm-night-theme"; @@ -67531,8 +67595,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; - rev = "1ca9841e9ae951d60d591befa5efaaf839916b75"; - sha256 = "0j8v8p4w586wz80q9scdby6b80sbxz4lqg9zb5pbr2w8bsps8n4m"; + rev = "9c6a09969c04cb07f5f56ac6f6c3abba5f06c871"; + sha256 = "0vzd0bmm53a0bhdbyvrqgswy453pnsfcnr71piwwhw4dp2zx32hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; @@ -67569,12 +67633,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161023.1219"; + version = "20161106.132"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "fda08e84567f62ea02b8a4893c745c237eb6b5b9"; - sha256 = "18jdsh4l7ygdvhfh0jyd5alsshvbx4pfx47impi3i2fy4rbkxljm"; + rev = "bae44d506af5d4f548f1b992229e369890f2a8a4"; + sha256 = "1ygsvcsf3pddcwyaw0m19z5j8is982ypxmz96qs2h0krfq9l6vl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -67608,18 +67672,19 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: + weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; version = "20110926.918"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; + src = fetchFromGitHub { + owner = "hexmode"; + repo = "weblogger-el"; + rev = "b3dd4aead9d3a87e6d85e7fef4f4f3bd40d87b53"; + sha256 = "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2/recipes/weblogger"; + sha256 = "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs"; name = "weblogger"; }; packageRequires = [ xml-rpc ]; @@ -67883,12 +67948,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161031.1056"; + version = "20161106.950"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "4b01b44c6718168be9553043124c3efd766abbc1"; - sha256 = "0kjrwaarrwrnxqbq8w23fs2j9nfv394lzpkzzjpakaaqfbzc1ck7"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68073,8 +68138,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "046a815ce570f65cfd79ed9f7dd73087b985aef5"; - sha256 = "1bmx2brynga0hv4cxc7n9skxi9gmhz3rjbfgxrsf1kc8yfpk56yq"; + rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd"; + sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -68462,8 +68527,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847"; - sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q"; + rev = "b2d9d6b38cbb3993d4c100b098fc7efc9274b9b4"; + sha256 = "1l42a5d7hdpa1nyvhqzas9smbgkrscylj58av7gsky6kndps89dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -68581,6 +68646,27 @@ license = lib.licenses.free; }; }) {}; + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wordgen"; + version = "20161104.944"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = "wordgen.el"; + rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; + sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/wordgen"; + license = lib.licenses.free; + }; + }) {}; wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordnut"; @@ -68626,12 +68712,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20160929.43"; + version = "20161107.535"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "b4b3888a1a2c39e659e60f3a106d0ff8b6f1e2a0"; - sha256 = "014f4a9xrn07c587p7npgdl9wcahqlba2hv2kcz891nz0zpxnwkb"; + rev = "997b7e02ab4684166162eb1bdf4b711e18017952"; + sha256 = "0nhh10rhn17a4iscl2y3c1v7axvc154s7j1cfpidjk9xc52vwz9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -68962,12 +69048,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161025.338"; + version = "20161105.1325"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "061d493b6e47aa96f9a3bea107b3586b21caab8b"; - sha256 = "0vhp81gr9lhwbq237fixmwjq1kipl5d2apy48hicgdzi1a8wcahv"; + rev = "79e004ee10d7f1d67200140f18e8a720be177273"; + sha256 = "17f5n23sp31manf58mvvyrixygza6plc0sl6n5k7lqfnlcas27d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69004,12 +69090,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161026.2246"; + version = "20161102.1328"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "161266e31b27fd060be56550f413e58e0436c04b"; - sha256 = "0b4g9xvi9v6qy3ijia800ph6j7cq06k72sc56kb7dkcgnjk9nxcm"; + rev = "40b0818411a77d496418f30a55f5ad4616350f35"; + sha256 = "1p0kc5viia17l4mls9ql2486cpnj2l2rp6nxlxij8ilw901q18d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69403,12 +69489,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161029.2045"; + version = "20161104.1949"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "89251eb9ddde4246e7c2b0a177706c6294ef4bea"; - sha256 = "1sn95gzw6ivniwci9czmb8mssz4cqbbzr9clsdh2pnxxmx1kx3xd"; + rev = "77e058710b20cb222647151e70416ef597929518"; + sha256 = "179nkk5hi6ylckjgxi536r78fvzv39kdnlbcdi0sscfn44q1ng6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -69634,12 +69720,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20160902.1142"; + version = "20161105.814"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "b03fba2be23ef928cc6e8752c87bf5f0e3dd422a"; - sha256 = "1nnqv0xq1w181cvd4yin7qij1lghyqg2x8qsll3k4f6jwnmwc561"; + rev = "f378589912af8731428198ef57546c616d941df0"; + sha256 = "0ag1psjrn4b1idz096jwdsygax7ydirhlky7zpj6awqzx4gh43yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -69925,12 +70011,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161030.1222"; + version = "20161106.705"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "140079b822452b141ce022bbf082deae17edd6d3"; - sha256 = "0f9pr23xkmdgpxrcrx04slzcqlm9jhs2j807ss50w9l3v5ckiz25"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70160,22 +70246,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "20161025.916"; + version = "20161106.1246"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "62fde99acdd1b1e149300903a7e4f03257019602"; - sha256 = "0zi43l26fwqpd97bz4spwqr2k3df279m26wb74wygl5rkj1v01lk"; + rev = "62773d94e975cafeca26b93679aaa04adfc36882"; + sha256 = "0ayxrz3n1ca4kgby09crrwdxii4py5v5icnclys6wmnigvmb4jsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; From 633387c0e8ae274767b8beb98648dde84b412477 Mon Sep 17 00:00:00 2001 From: Ji-Haeng Huh Date: Mon, 24 Oct 2016 14:55:50 +0200 Subject: [PATCH 332/336] tensorflow support for Darwin tensorflow 0.10.0 : Because of an upstream bug in tensorflow, only tensorflow > 0.10.0 is functional in Darwin system. Required python packages (mock 2.0.0 and funcsigs 1.0.2) are added Removing mock2_0_0 and funcsigs since now upstream supports them --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78f9187e7a3..cd35364998b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,7 +1067,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -14337,7 +14337,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -30386,15 +30386,19 @@ in { tensorflowNoGpuSupport = buildPythonPackage rec { name = "tensorflow"; - version = "0.9.0"; + version = "0.10.0"; format = "wheel"; src = pkgs.fetchurl { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; - sha256 = "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; + url = if stdenv.isDarwin then + "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else + "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = if stdenv.isDarwin then + "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else + "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; }; - propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig ]; + propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; preFixup = '' RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}" @@ -30407,6 +30411,7 @@ in { description = "TensorFlow helps the tensors flow (no gpu support)"; homepage = http://tensorflow.org; license = licenses.asl20; + platforms = with platforms; linux ++ darwin; }; }; From 0d5caf138a6dd38fe1cb085f01e1c216ce026890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Mon, 7 Nov 2016 20:46:34 -0500 Subject: [PATCH 333/336] tpacpi-bat: init at 3.0 (#20213) --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/tpacpi-bat/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/tpacpi-bat/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e463e852933..28ff28fba71 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -318,6 +318,7 @@ offline = "Jaka Hudoklin "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; + orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix new file mode 100644 index 00000000000..bf60331d8ad --- /dev/null +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, perl, kmod }: + +# Requires the acpi_call kernel module in order to run. +stdenv.mkDerivation rec { + name = "tpacpi-bat-${version}"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "teleshoes"; + repo = "tpacpi-bat"; + rev = "v${version}"; + sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp tpacpi-bat $out/bin + ''; + + postPatch = '' + substituteInPlace tpacpi-bat --replace modprobe ${kmod}/bin/modprobe + ''; + + meta = { + maintainers = [stdenv.lib.maintainers.orbekk]; + platforms = stdenv.lib.platforms.linux; + description = "Tool to set battery charging thesholds on Lenovo Thinkpad"; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3d2053f9cb..8c21249c247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11413,6 +11413,8 @@ in tiptop = callPackage ../os-specific/linux/tiptop { }; + tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; + trinity = callPackage ../os-specific/linux/trinity { }; tunctl = callPackage ../os-specific/linux/tunctl { }; From a0e8cbb4993748fbce4e108504a6295d79aa5dc3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Nov 2016 14:05:23 +0800 Subject: [PATCH 334/336] git-up: 1.4.1 -> 1.4.2 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37243a3e7ef..238b8fc076a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7023,16 +7023,16 @@ in { }; git-up = buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; name = "git-up-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/g/git-up/${name}.zip"; - sha256 = "1nsdzjnla0926fzfsqnwyzg3f7g253n8lk4wgw8nj2rv0awbdmas"; + sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; }; buildInputs = with self; [ pkgs.git nose ]; - propagatedBuildInputs = with self; [ colorama docopt GitPython six termcolor ]; + propagatedBuildInputs = with self; [ click colorama docopt GitPython six termcolor ]; # git fails to run as it cannot detect the email address, so we set it # $HOME is by default not a valid dir, so we have to set that too From 7438e3d97d030ab2f1711ab2ab6aa92d3f8a3f23 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Nov 2016 04:36:20 +0100 Subject: [PATCH 335/336] trv: fix evaluation that has been broken since e61663a23310a7f7cdb5e87a4ca332948da39177 --- 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 d94178c2de0..b47d7c72246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5230,7 +5230,7 @@ in tinycc = callPackage ../development/compilers/tinycc { }; - inherit (ocaml-ng.ocamlPackages_4_01_0) trv; + inherit (ocaml-ng.ocamlPackages_4_02) trv; bupc = callPackage ../development/compilers/bupc { }; From e3644f240155a0bd9d8c5f434cd3160d9613e0ee Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Nov 2016 04:38:26 +0100 Subject: [PATCH 336/336] ocamlPackages.fieldslib_p4: add ocamlbuild dependency --- pkgs/development/ocaml-modules/fieldslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index bbefcc0f3cc..6a8db9e6281 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true;