From ef3dbaa69a9b407b098530b465d3b58f51057375 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 8 Dec 2014 23:53:52 +0300 Subject: [PATCH 001/174] utf8proc: add the library --- .../libraries/utf8proc/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/utf8proc/default.nix diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix new file mode 100644 index 00000000000..803666b4246 --- /dev/null +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + version = "v1.1.6"; + + name = "utf8proc-${version}"; + + src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz"; + sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + }; + + installPhase = '' + mkdir -pv $out/lib $out/include + cp libutf8proc.so libutf8proc.a $out/lib + cp utf8proc.h $out/include + ''; + + meta = { + description = "utf8proc is a library for processing UTF-8 encoded Unicode strings"; + homepage = http://www.public-software-group.org/utf8proc; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e86264c5d..9c7a6867007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13277,6 +13277,8 @@ let tup = callPackage ../development/tools/build-managers/tup { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; + vice = callPackage ../misc/emulators/vice { libX11 = xlibs.libX11; giflib = giflib_4_1; From 6ed1d9f525643ca7087a1e9a85f80664a058c0dc Mon Sep 17 00:00:00 2001 From: codyopel Date: Sat, 28 Feb 2015 12:12:25 -0500 Subject: [PATCH 002/174] ffmpeg: refactor to generic * migrate some branches from ffmpeg.config., now allows version specific configuration * Added optionals for most features * Added qt-faststart executable * Licensing corrections * Added dependencies + celt + faad2 + flite + frei0r-plugins + fribidi + game-music-emu + gsm + jack2 + ladspa-sdk + libavc1394 + libbluray + libbs2b + libcaca + libmodplug + libogg + libraw1394 + libssh + libwebp + libxcb + lzma + openal + opencl + opengl + openh264 + openjpeg + openssl + pulseaudio + rtmpdump + samba + soxr + v4l-utils + vid.stab + wavpack + libX11 + libXv + wavpack + x265 + xavs + xvidcore + zeromq * Outlines support for: (unpackaged/broken dependencies) + aacplus + avisynth + crystalhd + blackmagic-design-desktop-video + flite + ilbc + libavc1394 + libcdio-paranoia + libiec61883 + libmfx + libnut + nvenc (nvidia) + opencl + opencore-amr + openh264 + oss + libquvi + schroedinger + shine + twolame + utvideo + vo-aacenc + vo-amrwbenc + zvbi --- pkgs/development/libraries/ffmpeg/0.10.nix | 93 +--- pkgs/development/libraries/ffmpeg/0.11.nix | 7 + pkgs/development/libraries/ffmpeg/0.5.nix | 7 + pkgs/development/libraries/ffmpeg/0.6.90.nix | 78 --- pkgs/development/libraries/ffmpeg/0.6.nix | 78 --- pkgs/development/libraries/ffmpeg/1.2.nix | 7 + pkgs/development/libraries/ffmpeg/1.x.nix | 109 ---- pkgs/development/libraries/ffmpeg/2.2.nix | 7 + pkgs/development/libraries/ffmpeg/2.2.x.nix | 109 ---- pkgs/development/libraries/ffmpeg/2.5.nix | 7 + pkgs/development/libraries/ffmpeg/2.x.nix | 108 ---- pkgs/development/libraries/ffmpeg/generic.nix | 527 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 40 +- 13 files changed, 582 insertions(+), 595 deletions(-) create mode 100644 pkgs/development/libraries/ffmpeg/0.11.nix create mode 100644 pkgs/development/libraries/ffmpeg/0.5.nix delete mode 100644 pkgs/development/libraries/ffmpeg/0.6.90.nix delete mode 100644 pkgs/development/libraries/ffmpeg/0.6.nix create mode 100644 pkgs/development/libraries/ffmpeg/1.2.nix delete mode 100644 pkgs/development/libraries/ffmpeg/1.x.nix create mode 100644 pkgs/development/libraries/ffmpeg/2.2.nix delete mode 100644 pkgs/development/libraries/ffmpeg/2.2.x.nix create mode 100644 pkgs/development/libraries/ffmpeg/2.5.nix delete mode 100644 pkgs/development/libraries/ffmpeg/2.x.nix create mode 100644 pkgs/development/libraries/ffmpeg/generic.nix diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index 556a41e2dca..bad142f6f96 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -1,88 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -, dc1394Support ? false, libdc1394 ? null -}: +{ callPackage, ... } @ args: -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.10.15"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = with stdenv.lib; { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - branch = "0.10"; - }; -} +callPackage ./generic.nix (args // rec { + version = "${branch}.15"; + branch = "0.10"; + sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix new file mode 100644 index 00000000000..abdb2666877 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0.11.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.5"; + branch = "0.11"; + sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.5.nix b/pkgs/development/libraries/ffmpeg/0.5.nix new file mode 100644 index 00000000000..82e0026ecbe --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0.5.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.15"; + branch = "0.5"; + sha256 = "1rcy15dv5bnpnncb78kgki9xl279bh99b76nzqdd87b61r04z74z"; +}) diff --git a/pkgs/development/libraries/ffmpeg/0.6.90.nix b/pkgs/development/libraries/ffmpeg/0.6.90.nix deleted file mode 100644 index 7455410d51a..00000000000 --- a/pkgs/development/libraries/ffmpeg/0.6.90.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.6.90-rc0"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1xn9fmpq2cbf1bx1gxbxnas8fq02gb8bmvvg5vjjxyw9lz5zw49f"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - broken = true; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix deleted file mode 100644 index 79ab5f1c980..00000000000 --- a/pkgs/development/libraries/ffmpeg/0.6.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-0.6.7"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - branch = "0.6"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix new file mode 100644 index 00000000000..c87cf581c76 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.2.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.12"; + branch = "1.2"; + sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; +}) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix deleted file mode 100644 index ae64135a4c3..00000000000 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, opusSupport ? true, libopus ? null -, vdpauSupport ? true, libvdpau ? null -, vaapiSupport ? true, libva ? null -, faacSupport ? false, faac ? null -, dc1394Support ? false, libdc1394 ? null -, x11grabSupport ? false, libXext ? null, libXfixes ? null -, playSupport ? true, SDL ? null -, freetypeSupport ? true, freetype ? null, fontconfig ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert opusSupport -> libopus != null; -assert vdpauSupport -> libvdpau != null; -assert vaapiSupport -> libva != null; -assert faacSupport -> faac != null; -assert x11grabSupport -> libXext != null && libXfixes != null; -assert playSupport -> SDL != null; -assert freetypeSupport -> freetype != null; - -stdenv.mkDerivation rec { - version = "1.2.10"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "02wdxr55a68rjxbyrsxczp55z2qmspw8cfa0yd55x3dv82657hnj"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional playSupport "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional playSupport SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if faacSupport then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.unix; - branch = "1"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix new file mode 100644 index 00000000000..e382fe7154d --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.2.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.13"; + branch = "2.2"; + sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"; +}) diff --git a/pkgs/development/libraries/ffmpeg/2.2.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix deleted file mode 100644 index d6e3c6a7db9..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.2.x.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus -, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL -, freetype, fontconfig, fdk_aac, gnutls -}: - -stdenv.mkDerivation rec { - version = "2.2.12"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1a1ki0v7c94l68blbimh3xl5adz599ql8nrdm2q0g285qy6mqxck"; - }; - - subtitleSupport = config.ffmpeg.subtitle or true; - mp3Support = config.ffmpeg.mp3 or true; - speexSupport = config.ffmpeg.speex or true; - theoraSupport = config.ffmpeg.theora or true; - vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or true; - x264Support = config.ffmpeg.x264 or true; - xvidSupport = config.ffmpeg.xvid or true; - opusSupport = config.ffmpeg.opus or true; - vdpauSupport = config.ffmpeg.vdpau or true; - vaapiSupport = config.ffmpeg.vaapi or true; - faacSupport = config.ffmpeg.faac or false; - fdkAACSupport = config.ffmpeg.fdk or false; - dc1394Support = config.ffmpeg.dc1394 or false; - x11grabSupport = config.ffmpeg.x11grab or false; - playSupport = config.ffmpeg.play or true; - freetypeSupport = config.ffmpeg.freetype or true; - gnutlsSupport = config.ffmpeg.gnutls or true; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" - ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" - ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] - ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - branch = "2.2"; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/2.5.nix b/pkgs/development/libraries/ffmpeg/2.5.nix new file mode 100644 index 00000000000..dbd5e0e2403 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.5.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.4"; + branch = "2.5"; + sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc"; +}) diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix deleted file mode 100644 index 55747061406..00000000000 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl -, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus -, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL -, freetype, fontconfig, fdk_aac, gnutls -}: - -stdenv.mkDerivation rec { - version = "2.5.4"; - name = "ffmpeg-${version}"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "11m2hbhdgphjxjp6hk438cxmipqjg5ixbr1kqnn9mbdhq9kc34fc"; - }; - - subtitleSupport = config.ffmpeg.subtitle or true; - mp3Support = config.ffmpeg.mp3 or true; - speexSupport = config.ffmpeg.speex or true; - theoraSupport = config.ffmpeg.theora or true; - vorbisSupport = config.ffmpeg.vorbis or true; - vpxSupport = config.ffmpeg.vpx or true; - x264Support = config.ffmpeg.x264 or true; - xvidSupport = config.ffmpeg.xvid or true; - opusSupport = config.ffmpeg.opus or true; - vdpauSupport = config.ffmpeg.vdpau or true; - vaapiSupport = config.ffmpeg.vaapi or true; - faacSupport = config.ffmpeg.faac or false; - fdkAACSupport = config.ffmpeg.fdk or false; - dc1394Support = config.ffmpeg.dc1394 or false; - x11grabSupport = config.ffmpeg.x11grab or false; - playSupport = config.ffmpeg.play or true; - freetypeSupport = config.ffmpeg.freetype or true; - gnutlsSupport = config.ffmpeg.gnutls or true; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--enable-shared" - "--enable-avresample" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass" - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional opusSupport "--enable-libopus" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay" - ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig" - ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree" - ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional opusSupport libopus - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional vaapiSupport libva - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] - ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL - ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ] - ++ stdenv.lib.optional fdkAACSupport fdk_aac - ++ stdenv.lib.optional gnutlsSupport gnutls - ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass - ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - passthru = { - inherit vdpauSupport; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix new file mode 100644 index 00000000000..fda9f8080a9 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -0,0 +1,527 @@ +{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +/* + * Licensing options (yes some are listed twice, filters and such are not listed) + */ +, gplLicensing ? true # GPL: fdkaac,openssl,frei0r,cdio,samba,utvideo,vidstab,x265,x265,xavs,avid,zvbi,x11grab +, version3Licensing ? true # (L)GPL3: opencore-amrnb,opencore-amrwb,samba,vo-aacenc,vo-amrwbenc +, nonfreeLicensing ? false # NONFREE: openssl,fdkaac,faac,aacplus,blackmagic-design-desktop-video +/* + * Build options + */ +, smallBuild ? false # Optimize for size instead of speed +, runtime-cpudetectBuild ? true # Detect CPU capabilities at runtime (disable to compile natively) +, grayBuild ? true # Full grayscale support +, swscale-alphaBuild ? true # Alpha channel support in swscale +, incompatible-libav-abiBuild ? false # Incompatible Libav fork ABI +, hardcoded-tablesBuild ? true # Hardcode decode tables instead of runtime generation +, safe-bitstream-readerBuild ? true # Buffer boundary checking in bitreaders +, memalign-hackBuild ? false # Emulate memalign +, multithreadBuild ? true # Multithreading via pthreads/win32 threads +, networkBuild ? true # Network support +, pixelutilsBuild ? true # Pixel utils in libavutil +/* + * Program options + */ +, ffmpegProgram ? true # Build ffmpeg executable +, ffplayProgram ? true # Build ffplay executable +, ffprobeProgram ? true # Build ffprobe executable +, ffserverProgram ? true # Build ffserver executable +, qt-faststartProgram ? true # Build qt-faststart executable +/* + * Library options + */ +, avcodecLibrary ? true # Build avcodec library +, avdeviceLibrary ? true # Build avdevice library +, avfilterLibrary ? true # Build avfilter library +, avformatLibrary ? true # Build avformat library +, avresampleLibrary ? true # Build avresample library +, avutilLibrary ? true # Build avutil library +, postprocLibrary ? true # Build postproc library +, swresampleLibrary ? true # Build swresample library +, swscaleLibrary ? true # Build swscale library +/* + * Documentation options + */ +, htmlpagesDocumentation ? false # HTML documentation pages +, manpagesDocumentation ? true # Man documentation pages +, podpagesDocumentation ? false # POD documentation pages +, txtpagesDocumentation ? false # Text documentation pages +/* + * External libraries options + */ +#, aacplusExtlib ? false, aacplus ? null # AAC+ encoder +, alsaLib ? null # Alsa in/output support +#, avisynth ? null # Support for reading AviSynth scripts +, bzip2 ? null +, celt ? null # CELT decoder +#, crystalhd ? null # Broadcom CrystalHD hardware acceleration +#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support +, faacExtlib ? false, faac ? null # AAC encoder +, faad2Extlib ? false, faad2 ? null # AAC decoder - DEPRECATED +, fdk-aacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder +#, flite ? null # Flite (voice synthesis) support +, fontconfig ? null # Needed for drawtext filter +, freetype ? null # Needed for drawtext filter +, frei0r ? null # frei0r video filtering +, fribidi ? null # Needed for drawtext filter +, game-music-emu ? null # Game Music Emulator +, gnutls ? null +, gsm ? null # GSM de/encoder +#, ilbc ? null # iLBC de/encoder +, jack2 ? null # Jack audio (only version 2 is supported in this build) +, ladspaH ? null # LADSPA audio filtering +, lame ? null # LAME MP3 encoder +, libass ? null # (Advanced) SubStation Alpha subtitle rendering +, libbluray ? null # BluRay reading +, libbs2b ? null # bs2b DSP library +, libcaca ? null # Textual display (ASCII art) +#, libcdio-paranoia ? null # Audio CD grabbing +, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) +, libiconv ? null +#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) +#, libmfx ? null # Hardware acceleration vis libmfx +, libmodplug ? null # ModPlug support +#, libnut ? null # NUT (de)muxer, native (de)muser exists +, libogg ? null # Ogg container used by vorbis & theora +, libopus ? null # Opus de/encoder +, libsndio ? null # sndio playback/record support +, libssh ? null # SFTP protocol +, libtheora ? null # Theora encoder +, libva ? null # Vaapi hardware acceleration +, libvdpau ? null # Vdpau hardware acceleration +, libvorbis ? null # Vorbis de/encoding, native encoder exists +, libvpx ? null # VP8 & VP9 de/encoding +, libwebp ? null # WebP encoder +, libX11 ? null # Xlib support +, libxcb ? null # X11 grabbing using XCB +, libxcb-shmExtlib ? true # X11 grabbing shm communication +, libxcb-xfixesExtlib ? true # X11 grabbing mouse rendering +, libxcb-shapeExtlib ? true # X11 grabbing shape rendering +, libXv ? null # Xlib support +, lzma ? null # xz-utils +#, nvenc ? null # NVIDIA NVENC support +, openal ? null # OpenAL 1.1 capture support +#, opencl ? null # OpenCL code +#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder +, opencv ? null # Video filtering +, openglExtlib ? false, mesa ? null # OpenGL rendering +#, openh264 ? null # H.264/AVC encoder +, openjpeg_1 ? null # JPEG 2000 de/encoder +, opensslExtlib ? false, openssl ? null +, pulseaudio ? null # Pulseaudio input support +, rtmpdump ? null # RTMP[E] support +#, libquvi ? null # Quvi input support +, sambaExtlib ? false, samba ? null # Samba protocol +#, schroedinger ? null # Dirac de/encoder +, SDL ? null +#, shine ? null # Fixed-point MP3 encoder +, soxr ? null # Resampling via soxr +, speex ? null # Speex de/encoder +#, twolame ? null # MP2 encoder +#, utvideo ? null # Ut Video de/encoder +, v4l_utils ? null # Video 4 Linux support +, vid-stab ? null # Video stabilization +#, vo-aacenc ? null # AAC encoder +#, vo-amrwbenc ? null # AMR-WB encoder +, wavpack ? null # Wavpack encoder +, x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) +, x264 ? null # H.264/AVC encoder +, x265 ? null # H.265/HEVC encoder +, xavs ? null # AVS encoder +, xvidcore ? null # Xvid encoder, native encoder exists +, zeromq4 ? null # Message passing +, zlib ? null +#, zvbi ? null # Teletext support +/* + * Developer options + */ +, debugDeveloper ? false +, optimizationsDeveloper ? true +, extra-warningsDeveloper ? false +, strippingDeveloper ? false +/* + * Inherit generics + */ +, branch, sha256, version, ... +}: + +/* Maintainer notes: + * + * Version bumps: + * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release) + * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed + * and make the necessary changes. + * + * En/disabling in/outdevs was added in 0.6 + * + * Packages with errors: + * flite ilbc schroedinger + * + * Not packaged: + * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 + * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame + * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video + * + * Not supported: + * stagehright-h264(android only) + * + * Known issues: + * 0.5 - libgsm: configure fails to find library (fix: disable for 0.5) + * 0.5-0.8 - qt-quickstart: make error (fix: disable for 0.5-0.8) + * 0.6 - fails to compile (unresolved) (so far, only disabling a number of features + * works, but that is not a feasible solution) + * 0.6.90 - mmx: compile errors (fix: disable for 0.6.90-rc0) + * 0.7-1.1 - opencv: compile error, flag added in 0.7 (fix: disable for 0.7-1.1) + * 1.1 - libsoxr: compile error (fix: disable for 1.1) + * Support was initially added in 1.1 before soxr api change, fix would probably be to add soxr-1.0 + * 2.0-2.1 - vid-stab: compile errors, flag added in 2.0 (fix: disable for 2.0-2.1) + * Recent changes (circa 2014) more than likely broke compatibility and a fix has not been back ported + * ALL - flite: configure fails to find library (tested against 1.4 & 1.9 & 2.0) + * Tried modifying configure and flite to use pkg-config + * ALL - Cross-compiling will disable features not present on host OS + * (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin) + * + */ + +let + # Minimum/maximun/matching version + cmpVer = builtins.compareVersions; + reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); + reqMax = requiredVersion: (cmpVer branch requiredVersion != 1); + reqMatch = requiredVersion: (cmpVer requiredVersion branch == 0); + + # Configure flag + mkFlag = optSet: minVer: flag: if reqMin minVer then ( + if optSet then "--enable-${flag}" else "--disable-${flag}") + else null; + # Deprecated configure flag (e.g. faad2) + depFlag = optSet: minVer: maxVer: flag: if reqMin minVer && reqMax maxVer then mkFlag optSet minVer flag else null; + + # Version specific fix + verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix; + + # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1) + chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag; + + isCygwin = stdenv.isCygwin; +in + +/* + * Licensing dependencies + */ +assert version3Licensing && reqMin "0.5" -> gplLicensing; +assert nonfreeLicensing && reqMin "0.5" -> gplLicensing && version3Licensing; +/* + * Build dependencies + */ +assert networkBuild -> gnutls != null || opensslExtlib; +assert pixelutilsBuild -> avutilLibrary; +/* + * Program dependencies + */ +assert ffmpegProgram && reqMin "0.5" -> avcodecLibrary + && avfilterLibrary + && avformatLibrary + && swresampleLibrary; +assert ffplayProgram && reqMin "0.5" -> avcodecLibrary + && avformatLibrary + && swscaleLibrary + && swresampleLibrary + && SDL != null; +assert ffprobeProgram && reqMin "0.6" -> avcodecLibrary && avformatLibrary; +assert ffserverProgram && reqMin "0.5" -> avformatLibrary; +/* + * Library dependencies + */ +assert avcodecLibrary && reqMin "0.6" -> avutilLibrary; # configure flag since 0.6 +assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary + && avcodecLibrary + && avutilLibrary; # configure flag since 0.6 +assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 +assert avresampleLibrary && reqMin "0.11" -> avutilLibrary; +assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary; +assert swresampleLibrary && reqMin "0.9" -> soxr != null; +assert swscaleLibrary && reqMin "0.5" -> avutilLibrary; +/* + * External libraries + */ +#assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing; +#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing; +#assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null +# && !isCygwin && multithreadBuild # POSIX threads required +# && nonfreeLicensing; +assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing; +assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing; +assert frei0r != null && reqMin "0.7" -> gplLicensing; +assert gnutls != null && reqMin "0.9" -> !opensslExtlib; +assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null; +assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null; +assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null; +#assert opencore-amr != null && reqMin "0.5" -> version3Licensing; +assert openglExtlib && reqMin "2.2" -> mesa != null; +assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing; +assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing; +#assert utvideo != null && reqMin "0.9" -> gplLicensing; +assert vid-stab != null && reqMin "2.0" -> gplLicensing; +#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing; +#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing; +assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing; +assert x264 != null && reqMin "0.5" -> gplLicensing; +assert x265 != null && reqMin "2.2" -> gplLicensing; +assert xavs != null && reqMin "0.7" -> gplLicensing; +assert xvidcore != null && reqMin "0.5" -> gplLicensing; +#assert zvbi != null && reqMin "2.1" -> gplLicensing; + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "ffmpeg-${version}"; + inherit version; + + src = fetchurl { + url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; + inherit sha256; + }; + + patchPhase = ''patchShebangs .''; + + configureFlags = [ + /* + * Licensing flags + */ + (mkFlag gplLicensing "0.5" "gpl") + (mkFlag version3Licensing "0.5" "version3") + (mkFlag nonfreeLicensing "0.5" "nonfree") + /* + * Build flags + */ + # One some ARM platforms --enable-thumb + "--enable-shared --disable-static" + (mkFlag true "0.6" "pic") + (mkFlag smallBuild "0.5" "small") + (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect") + (mkFlag grayBuild "0.5" "gray") + (mkFlag swscale-alphaBuild "0.6" "swscale-alpha") + (mkFlag incompatible-libav-abiBuild "2.0" "incompatible-libav-abi") + (mkFlag hardcoded-tablesBuild "0.5" "hardcoded-tables") + (mkFlag safe-bitstream-readerBuild "0.9" "safe-bitstream-reader") + (mkFlag memalign-hackBuild "0.5" "memalign-hack") + (if reqMin "0.5" then ( + if multithreadBuild then ( + if isCygwin then + "--disable-pthreads --enable-w32threads" + else # Use POSIX threads by default + "--enable-pthreads --disable-w32threads") + else + "--disable-pthreads --disable-w32threads") + else null) + (if reqMin "0.9" then "--disable-os2threads" else null) # We don't support OS/2 + (mkFlag networkBuild "0.5" "network") + (mkFlag pixelutilsBuild "2.4" "pixelutils") + /* + * Program flags + */ + (mkFlag ffmpegProgram "0.5" "ffmpeg") + (mkFlag ffplayProgram "0.5" "ffplay") + (mkFlag ffprobeProgram "0.6" "ffprobe") + (mkFlag ffserverProgram "0.5" "ffserver") + /* + * Library flags + */ + (mkFlag avcodecLibrary "0.6" "avcodec") + (mkFlag avdeviceLibrary "0.6" "avdevice") + (mkFlag avfilterLibrary "0.5" "avfilter") + (mkFlag avformatLibrary "0.6" "avformat") + (mkFlag avresampleLibrary "1.0" "avresample") + (mkFlag avutilLibrary "1.1" "avutil") + (mkFlag postprocLibrary "0.5" "postproc") + (mkFlag swresampleLibrary "0.9" "swresample") + (mkFlag swscaleLibrary "0.5" "swscale") + /* + * Documentation flags + */ + (mkFlag (htmlpagesDocumentation + || manpagesDocumentation + || podpagesDocumentation + || txtpagesDocumentation) "0.6" "doc") + (mkFlag htmlpagesDocumentation "1.0" "htmlpages") + (mkFlag manpagesDocumentation "1.0" "manpages") + (mkFlag podpagesDocumentation "1.0" "podpages") + (mkFlag txtpagesDocumentation "1.0" "txtpages") + /* + * External libraries + */ + #(mkFlag aacplus "0.7" "libaacplus") + #(mkFlag avisynth "0.5" "avisynth") + (mkFlag (bzip2 != null) "0.5" "bzlib") + (mkFlag (celt != null) "0.8" "libcelt") + #crystalhd + #(mkFlag decklinkExtlib "2.2" "decklink") + (mkFlag faacExtlib "0.5" "libfaac") + (depFlag faad2Extlib "0.5" "0.6" "libfaad") + (mkFlag fdk-aacExtlib "1.0" "libfdk-aac") + #(mkFlag (flite != null) "1.0" "libflite") + (if reqMin "1.0" then # Force disable until a solution is found + "--disable-libflite" + else null) + (mkFlag (fontconfig != null) "1.0" "fontconfig") + (mkFlag (freetype != null) "0.7" "libfreetype") + (mkFlag (frei0r != null) "0.7" "frei0r") + (mkFlag (fribidi != null) "2.3" "libfribidi") + (mkFlag (game-music-emu != null) "2.2" "libgme") + (mkFlag (gnutls != null) "0.9" "gnutls") + (verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm") + #(mkFlag (ilbc != null) "1.0" "libilbc") + (mkFlag (ladspaH !=null) "2.1" "ladspa") + (mkFlag (lame != null) "0.5" "libmp3lame") + (mkFlag (libass != null) "0.9" "libass") + #(mkFlag (libavc1394 != null) null null) + (mkFlag (libbluray != null) "1.0" "libbluray") + (mkFlag (libbs2b != null) "2.3" "libbs2b") + (mkFlag (libcaca != null) "1.0" "libcaca") + #(mkFlag (cdio-paranoia != null) "0.9" "libcdio") + (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") + (mkFlag (libiconv != null) "1.2" "iconv") + #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") + (mkFlag (libmfz != null) "2.6" "libmfx") + (mkFlag (libmodplug != null) "0.9" "libmodplug") + #(mkFlag (libnut != null) "0.5" "libnut") + (mkFlag (libopus != null) "1.0" "libopus") + (mkFlag (libssh != null) "2.1" "libssh") + (mkFlag (libtheora != null) "0.5" "libtheora") + (mkFlag (libva != null) "0.6" "vaapi") + (mkFlag (libvdpau != null) "0.5" "vdpau") + (mkFlag (libvorbis != null) "0.5" "libvorbis") + (mkFlag (libvpx != null) "0.6" "libvpx") + (mkFlag (libwebp != null) "2.2" "libwebp") + (mkFlag (libX11 != null && libXv != null) "2.3" "xlib") + (mkFlag (libxcb != null) "2.5" "libxcb") + (mkFlag libxcb-shmExtlib "2.5" "libxcb-shm") + (mkFlag libxcb-xfixesExtlib "2.5" "libxcb-xfixes") + (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") + (mkFlag (lzma != null) "2.4" "lzma") + #(mkFlag nvenc "2.6" "nvenc") + (mkFlag (openal != null) "0.9" "openal") + #(mkFlag opencl "2.2" "opencl") + #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb") + #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb") + (mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 + (mkFlag openglExtlib "2.2" "opengl") + #(mkFlag (openh264 != null) "2.6" "openh264") + (mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg") + (mkFlag opensslExtlib "0.9" "openssl") + (mkFlag (pulseaudio != null) "0.9" "libpulse") + #(mkFlag quvi "2.0" "libquvi") + (mkFlag (rtmpdump != null) "0.6" "librtmp") + #(mkFlag (schroedinger != null) "0.5" "libschroedinger") + #(mkFlag (shine != null) "2.0" "libshine") + (mkFlag sambaExtlib "2.3" "libsmbclient") + (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then + (mkFlag (soxr != null) "1.2" "libsoxr") + (mkFlag (speex != null) "0.5" "libspeex") + #(mkFlag (twolame != null) "1.0" "libtwolame") + #(mkFlag (utvideo != null) "0.9" "libutvideo") + (mkFlag (v4l_utils != null) "0.9" "libv4l2") + (mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0 + #(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc") + #(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc") + (mkFlag (wavpack != null) "2.0" "libwavpack") + (mkFlag (x11grabExtlib) "0.5" "x11grab") + (mkFlag (x264 != null) "0.5" "libx264") + (mkFlag (x265 != null) "2.2" "libx265") + (mkFlag (xavs != null) "0.7" "libxavs") + (mkFlag (xvidcore != null) "0.5" "libxvid") + (mkFlag (zeromq4 != null) "2.0" "libzmq") + (mkFlag (zlib != null) "0.5" "zlib") + #(mkFlag (zvbi != null) "2.1" "libzvbi") + /* + * Developer flags + */ + (mkFlag debugDeveloper "0.5" "debug") + (mkFlag optimizationsDeveloper "0.5" "optimizations") + (mkFlag extra-warningsDeveloper "0.5" "extra-warnings") + (mkFlag strippingDeveloper "0.5" "stripping") + + # Disable mmx support for 0.6.90 + (verFix null "0.6.90" "--disable-mmx") + ]; + + nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + + buildInputs = [ + alsaLib bzip2 celt faac faad2 fdk_aac fontconfig freetype frei0r fribidi + game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b + libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora + libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes + libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump + samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore + zeromq4 zlib + ]; + + # Build qt-faststart executable + buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; + postInstall = optional (qt-faststartProgram && (reqMin "0.9")) ''cp -a tools/qt-faststart $out/bin/''; + + enableParallelBuilding = true; + + /* Cross-compilation is untested, consider this an outline, more work + needs to be done to portions of the build to get it to work correctly */ + crossAttrs = let + os = '' + if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then + # Probably should look for mingw too + echo "cygwin" + elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then + echo "darwin" + elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then + echo "freebsd" + elif [ "${stdenv.cross.config}" = "*linux*" ] ; then + echo "linux" + elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then + echo "netbsd" + elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then + echo "openbsd" + fi + ''; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=${os}" + "--arch=${stdenv.cross.arch}" + ]; + }; + + /* TODO: In the future more FFmpeg optionals should be added so that packages that + depend on FFmpeg can check to make sure a required feature is enabled. Since + features are version dependent, versioning needs to be handled as well */ + passthru = { + vdpauSupport = libvdpau != null; + }; + + meta = { + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + homepage = http://www.ffmpeg.org/; + longDescription = '' + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + mux, demux, stream, filter and play pretty much anything that humans and machines + have created. It supports the most obscure ancient formats up to the cutting edge. + No matter if they were designed by some standards committee, the community or + a corporation. + ''; + licenses = ( + if nonfreeLicensing then + licenses.unfreeRedistributable + else if version3Licensing then + licenses.gpl3 + else if gplLicensing then + licenses.gpl2Plus + else + licenses.lgpl21Plus + ); + platforms = platforms.all; + maintainers = with maintainers; [ codyopel fuuzetsu ]; + inherit branch; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f00392005f..3e536441a7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1313,7 +1313,7 @@ let ftop = callPackage ../os-specific/linux/ftop { }; fuppes = callPackage ../tools/networking/fuppes { - ffmpeg = ffmpeg_0_6_90; + ffmpeg = ffmpeg_0_5; }; fsfs = callPackage ../tools/filesystems/fsfs { }; @@ -1709,7 +1709,7 @@ let makebootfat = callPackage ../tools/misc/makebootfat { }; minidlna = callPackage ../tools/networking/minidlna { - ffmpeg = ffmpeg_0_10; + ffmpeg = ffmpeg_0; }; mmv = callPackage ../tools/misc/mmv { }; @@ -5486,26 +5486,16 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { - vpxSupport = !stdenv.isMips; - }; - - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { }; - - ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; - + ffmpeg_0_5 = callPackage ../development/libraries/ffmpeg/0.5.nix { }; + ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; + ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { }; + ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; + ffmpeg_2_5 = callPackage ../development/libraries/ffmpeg/2.5.nix { }; + # Aliases + ffmpeg_0 = ffmpeg_0_11; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_5; ffmpeg = ffmpeg_2; ffms = callPackage ../development/libraries/ffms { }; @@ -7560,9 +7550,7 @@ let xdo = callPackage ../tools/misc/xdo { }; - xineLib = callPackage ../development/libraries/xine-lib { - ffmpeg = ffmpeg_1; - }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -12492,7 +12480,7 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_0_6; + ffmpeg = ffmpeg_0_5; lua = lua5; }; From 90b74276cbb82b1fb0a626cbbd3a31530916c2db Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 30 Jan 2015 16:57:29 +0100 Subject: [PATCH 003/174] Add package: khal --- pkgs/applications/misc/khal/default.nix | 34 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/khal/default.nix diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix new file mode 100644 index 00000000000..85720f64483 --- /dev/null +++ b/pkgs/applications/misc/khal/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgs, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + version = "0.4.0"; + name = "khal-${version}"; + + src = fetchurl { + url = "https://github.com/geier/khal/archive/v${version}.tar.gz"; + sha256 = "0d32miq55cly4q3raxkw3xpq4d5y3hvzaqvy066nv35bdlpafxi1"; + }; + + propagatedBuildInputs = with pythonPackages; [ + atomicwrites + click + configobj + dateutil + icalendar + lxml + pkgs.vdirsyncer + pytz + pyxdg + requests_toolbelt + tzlocal + urwid + ]; + + meta = { + homepage = http://lostpackets.de/khal/; + description = "CLI calendar application"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f00392005f..200c9a5b83e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10675,6 +10675,10 @@ let keymon = callPackage ../applications/video/key-mon { }; + khal = callPackage ../applications/misc/khal { + pythonPackages = python3Packages; + }; + kid3 = callPackage ../applications/audio/kid3 { qt = qt4; }; From 137f28184953f271241de220819360040696945c Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 5 Mar 2015 23:01:21 +0900 Subject: [PATCH 004/174] oraclejdk: bump to 8u40 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index fbb6ae30f51..ea1c01ec5e5 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "31"; + patchVersion = "40"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1sr3q9y0cd42cqpf98gsv3hvip0r1vw3d0jh6yml6krzdm96zp8s"; - sha256_x86_64 = "0dz4k3xds1ydqr77hmrjc1w0niqq3jm3h18nk3ibqr1083l1bq7g"; + sha256_i686 = "1bfabnmbar0kfx3i37wnxh97j7whkib8m6wqxrb1d9zf6k13bw50"; + sha256_x86_64 = "0nfm4xqd57s8dmkgd0jsrhys8dhfw0fx5d57mq70ramq9dl2jq66"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; From bf286c587bc851c5d57629feb8fb9358f46bf445 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Thu, 5 Mar 2015 19:17:58 +0000 Subject: [PATCH 005/174] Bump InfluxDB to 0.8.3 - Prevents the automatic creation of shards that was causing too many shards being created when used with grafana. - It's the most recent version that allows updating from 0.7 --- pkgs/servers/nosql/influxdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 03a3a9cd43a..92b1b73d0a0 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -4,14 +4,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "influxdb-${version}"; - version = "0.8.2"; + version = "0.8.3"; arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz"; sha256 = if arch == "amd64" then - "0m27agjf9v76w5xms8w3z91k4hxw832nxqr030qzqxynwbxj0vg6" else - "0bdjpdq4yhfsmvl756xhkd1d8565d19g66l5rlymksc71ps8kbj6"; + "e625902d403434c799f9d9ffc2592a3880f82d435423fde7174e5e4fe0f41148" else + "5abe9f432553e66c8aff86c4311eba16b874678d04b52bfe9e2019c01059ec78"; }; buildInputs = [ makeWrapper ]; From a1a585078a65833114cdf635454970e0d047dca8 Mon Sep 17 00:00:00 2001 From: j-keck Date: Thu, 5 Mar 2015 20:45:17 +0100 Subject: [PATCH 006/174] scala_2_10: update to 2.10.5 --- pkgs/development/compilers/scala/2.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index d7e7ecf1ce2..b518a9a0e0e 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.10.4"; + name = "scala-2.10.5"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl"; + sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci"; }; buildInputs = [ jre makeWrapper ] ; From 7da51f9eb7c092beb157fba7aa21e25d9ff0abd1 Mon Sep 17 00:00:00 2001 From: j-keck Date: Thu, 5 Mar 2015 20:47:54 +0100 Subject: [PATCH 007/174] scala: update to 2.11.6 --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 82cd9fd9087..9e55d9f3ac2 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.5"; + name = "scala-2.11.6"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0ip2nb4n68q8gqbc15dq55xfpvr0yi8fwsn8ycz4marl6qb0rhyv"; + sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1"; }; buildInputs = [ jre makeWrapper ] ; From 0f7c125ca4b208589e620b4a255188cd666a1036 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 5 Mar 2015 23:56:32 +0100 Subject: [PATCH 008/174] awesome: 3.5.5 -> 3.5.6 --- pkgs/applications/window-managers/awesome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 20cd15abf1c..b51de4a02a9 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -6,15 +6,15 @@ , docbook_xsl }: let - version = "3.5.5"; + version = "3.5.6"; in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - + src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0iwd4pjvq0akm9dbipbl4m4fm24m017l06arasr445v2qkbxnc5z"; + sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p"; }; meta = with stdenv.lib; { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; }; - + buildInputs = [ asciidoc cairo From 421e79b8d1388b812a1e6ba300d0bff5a5376544 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 6 Mar 2015 00:04:46 +0100 Subject: [PATCH 009/174] awesome: do not depend on rxvt_unicode, but xterm xterm is being used as terminal in the default configuration. --- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b51de4a02a9..3b655b55c9c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter -, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ - --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" + --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" From 116ddda218bf5b57f35c04e0eec213a715155e5c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 6 Mar 2015 20:28:56 +0100 Subject: [PATCH 010/174] Adds ocaml-enumerate Quotation expanders for enumerating finite types in OCaml. --- .../ocaml-modules/enumerate/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/enumerate/default.nix diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix new file mode 100644 index 00000000000..ce20cdd47bb --- /dev/null +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; + +stdenv.mkDerivation { + name = "ocaml-enumerate-111.08.00"; + + src = fetchurl { + url = https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz; + sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ type_conv camlp4 ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://ocaml.janestreet.com/; + description = "Quotation expanders for enumerating finite types"; + license = stdenv.lib.licenses.asl20; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1d3983f8d4..ea6df75403a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3898,6 +3898,10 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; + enumerate = callPackage ../development/ocaml-modules/enumerate { + type_conv = ocaml_typeconv; + }; + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; From bc49764fe2eb17ae4538fc02e35ed88d3cf6dd0b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Mar 2015 11:55:10 -0800 Subject: [PATCH 011/174] spl_git: 2015-02-27 -> 2015-03-03 --- pkgs/os-specific/linux/spl/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 7894190269c..0a4e79b41a4 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-02-27"; + version = "2015-03-03"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "c1bc8e610be8bf1cc8170f788a89a9ee257eb51f"; - sha256 = "1rpq7rxqmqmlaqv9aj7n2bmlw3ls55iyhcsk8kp4g9kf20f0pgym"; + rev = "6ab08667a44458f775da9f0ecceddbcea1275746"; + sha256 = "1n168kgagc6fkm9pqfwvlbqgw85z8ksjfy3bff69pi0cn1g9d739"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; From e49db703dca4164e120cf929408a5d7377f660ad Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Mar 2015 11:56:24 -0800 Subject: [PATCH 012/174] zfs_git: 2015-03-02 -> 2015-03-05 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 4b4773db7e1..2007cd83518 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-02"; + version = "2015-03-05"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "d14cfd83dae0b1a261667acd416dba17a98d15fa"; - sha256 = "0dbvsw3v26l15h1nmdkr6jhijq87gryyvzbnxqdc823x4m9qfvrw"; + rev = "417104bdd3c7ce07ec58674dd078f9891c3bc780"; + sha256 = "0w6cr6avi3raxdzqzljn840k1vcvakqrb88jifsqnd5asws5v8wm"; }; patches = [ From a00e19ceb96ed8ae2910b009c1ed79dff7167517 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Mar 2015 11:59:05 -0800 Subject: [PATCH 013/174] samba4: Remove explicit libiconv specification --- 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 ea6df75403a..777c5e3d1ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8313,7 +8313,6 @@ let samba4 = callPackage ../servers/samba/4.x.nix { libgcrypt = libgcrypt_1_6; - libiconv = if stdenv.isLinux then null else libiconv; python = python2; pythonPackages = python2Packages; }; From 3ed077a69bf49d3b92fc8f592bbce29f7babb866 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Mar 2015 16:16:20 -0500 Subject: [PATCH 014/174] lldb-3.5 is broken, bug in the cmake lldb-3.6 is working (just waiting on a staging fix to merge), so let's just mark this broken until we decide to nuke 3.5 all together. Fixes #6636 refs #6668 --- pkgs/development/compilers/llvm/3.5/lldb.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 9a25401a874..92ba4108a4d 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; + broken = true; }; } From c410664d8b2f7b74ff86a36e55a10ab6d34e0073 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 6 Mar 2015 13:42:32 -0800 Subject: [PATCH 015/174] mongodb: 2.6.7 -> 2.6.8 --- pkgs/servers/nosql/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 90e229d54ac..dbfaf313d8a 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let version = "2.6.7"; +let version = "2.6.8"; system-libraries = [ "pcre" "boost" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1jbbvpp9xisxm7rpx8mm25413b01rrssqcl03349rwgamp8m88ji"; + sha256 = "01hs65xswggy628hxka2f63qvwz5rfhqlkb05kr20wz1kl6zd5qr"; }; nativeBuildInputs = [ scons ]; From 90a0fd8d4314f4b46d49eac2959650c470c4ac40 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 7 Mar 2015 02:04:45 +0300 Subject: [PATCH 016/174] keybase: update CLI to 0.7.7 --- .../misc/keybase-node-client/default.nix | 4 +- .../misc/keybase-node-client/package.nix | 3830 ++++++++--------- 2 files changed, 1696 insertions(+), 2138 deletions(-) diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase-node-client/default.nix index bacd8d46fd5..048b42159b8 100644 --- a/pkgs/applications/misc/keybase-node-client/default.nix +++ b/pkgs/applications/misc/keybase-node-client/default.nix @@ -11,11 +11,11 @@ let in nodePackages.buildNodePackage rec { name = "keybase-node-client-${version}"; - version = "0.7.0"; + version = "0.7.7"; src = [(fetchurl { url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz"; - sha256 = "0n73v4f61rq2dvy2yd3s4l8qvvjzp3ncqj70llm4i6cvbp9kym1v"; + sha256 = "1p2plxz4lf5pbrvl5sql00lk459lnxcz7cxc4cdhfzc6h4ql425f"; })]; deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase-node-client/package.nix index 85d10ad0ba4..2835fe81b98 100644 --- a/pkgs/applications/misc/keybase-node-client/package.nix +++ b/pkgs/applications/misc/keybase-node-client/package.nix @@ -3,1027 +3,898 @@ { by-spec."CSSselect"."~0.4.0" = self.by-version."CSSselect"."0.4.1"; - by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSselect-0.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - name = "CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; - }) - ]; - buildInputs = - (self.nativeDeps."CSSselect" or []); - deps = [ - self.by-version."CSSwhat"."0.4.7" - self.by-version."domutils"."1.4.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "CSSselect" ]; + by-version."CSSselect"."0.4.1" = self.buildNodePackage { + name = "CSSselect-0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + name = "CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; + }; + deps = { + "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7"; + "domutils-1.4.3" = self.by-version."domutils"."1.4.3"; + }; + peerDependencies = []; }; by-spec."CSSwhat"."0.4" = self.by-version."CSSwhat"."0.4.7"; - by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-CSSwhat-0.4.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - name = "CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; - }) - ]; - buildInputs = - (self.nativeDeps."CSSwhat" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "CSSwhat" ]; + by-version."CSSwhat"."0.4.7" = self.buildNodePackage { + name = "CSSwhat-0.4.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + name = "CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; - by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { - name = "node-argparse-0.1.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; - name = "argparse-0.1.15.tgz"; - sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; - }) - ]; - buildInputs = - (self.nativeDeps."argparse" or []); - deps = [ - self.by-version."underscore"."1.4.4" - self.by-version."underscore.string"."2.3.3" - ]; - peerDependencies = [ - ]; - passthru.names = [ "argparse" ]; + by-version."argparse"."0.1.15" = self.buildNodePackage { + name = "argparse-0.1.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + name = "argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + }; + deps = { + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; + }; + peerDependencies = []; }; "argparse" = self.by-version."argparse"."0.1.15"; by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-asn1-0.1.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }) - ]; - buildInputs = - (self.nativeDeps."asn1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "asn1" ]; + by-version."asn1"."0.1.11" = self.buildNodePackage { + name = "asn1-0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + deps = { + }; + peerDependencies = []; }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-assert-plus-0.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; - }) - ]; - buildInputs = - (self.nativeDeps."assert-plus" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "assert-plus" ]; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = self.buildNodePackage { + name = "assert-plus-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."async"."0.2.x" = self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.2.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; + by-version."async"."0.9.0" = self.buildNodePackage { + name = "async-0.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-aws-sign2-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sign2" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "aws-sign2" ]; + by-version."aws-sign2"."0.5.0" = self.buildNodePackage { + name = "aws-sign2-0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."badnode"."^1.0.1" = + self.by-version."badnode"."1.0.1"; + by-version."badnode"."1.0.1" = self.buildNodePackage { + name = "badnode-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/badnode/-/badnode-1.0.1.tgz"; + name = "badnode-1.0.1.tgz"; + sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0"; + }; + deps = { + "semver-4.3.1" = self.by-version."semver"."4.3.1"; + }; + peerDependencies = []; + }; + "badnode" = self.by-version."badnode"."1.0.1"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."bitcoyne".">=0.0.6" = - self.by-version."bitcoyne"."0.0.6"; - by-version."bitcoyne"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-bitcoyne-0.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-0.0.6.tgz"; - name = "bitcoyne-0.0.6.tgz"; - sha1 = "a309d1afe7554f2b380782428cd6f67a82183d2f"; - }) - ]; - buildInputs = - (self.nativeDeps."bitcoyne" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."kbpgp"."1.0.5" - self.by-version."pgp-utils"."0.0.27" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bitcoyne" ]; + self.by-version."bitcoyne"."1.0.1"; + by-version."bitcoyne"."1.0.1" = self.buildNodePackage { + name = "bitcoyne-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-1.0.1.tgz"; + name = "bitcoyne-1.0.1.tgz"; + sha1 = "5a775f93ccb8c4b7b26d4c2a44c25916783cf40e"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "kbpgp-2.0.8" = self.by-version."kbpgp"."2.0.8"; + "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27"; + }; + peerDependencies = []; }; - "bitcoyne" = self.by-version."bitcoyne"."0.0.6"; + "bitcoyne" = self.by-version."bitcoyne"."1.0.1"; by-spec."bn"."^1.0.0" = self.by-version."bn"."1.0.1"; - by-version."bn"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-bn-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz"; - name = "bn-1.0.1.tgz"; - sha1 = "a153825e6b1eb2c2db7726149b047a07ce0a3bb3"; - }) - ]; - buildInputs = - (self.nativeDeps."bn" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "bn" ]; + by-version."bn"."1.0.1" = self.buildNodePackage { + name = "bn-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz"; + name = "bn-1.0.1.tgz"; + sha1 = "a153825e6b1eb2c2db7726149b047a07ce0a3bb3"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."bn"."^1.0.1" = self.by-version."bn"."1.0.1"; "bn" = self.by-version."bn"."1.0.1"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-boom-0.4.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }) - ]; - buildInputs = - (self.nativeDeps."boom" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "boom" ]; + by-version."boom"."0.4.2" = self.buildNodePackage { + name = "boom-0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = []; + }; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }; + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = []; }; by-spec."cheerio"."0.13.0" = self.by-version."cheerio"."0.13.0"; - by-version."cheerio"."0.13.0" = lib.makeOverridable self.buildNodePackage { - name = "node-cheerio-0.13.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; - name = "cheerio-0.13.0.tgz"; - sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; - }) - ]; - buildInputs = - (self.nativeDeps."cheerio" or []); - deps = [ - self.by-version."htmlparser2"."3.4.0" - self.by-version."underscore"."1.4.4" - self.by-version."entities"."0.5.0" - self.by-version."CSSselect"."0.4.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cheerio" ]; + by-version."cheerio"."0.13.0" = self.buildNodePackage { + name = "cheerio-0.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; + name = "cheerio-0.13.0.tgz"; + sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; + }; + deps = { + "htmlparser2-3.4.0" = self.by-version."htmlparser2"."3.4.0"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "entities-0.5.0" = self.by-version."entities"."0.5.0"; + "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1"; + }; + peerDependencies = []; }; "cheerio" = self.by-version."cheerio"."0.13.0"; by-spec."cli"."0.4.x" = self.by-version."cli"."0.4.5"; - by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cli-0.4.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; - name = "cli-0.4.5.tgz"; - sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; - }) - ]; - buildInputs = - (self.nativeDeps."cli" or []); - deps = [ - self.by-version."glob"."4.0.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cli" ]; + by-version."cli"."0.4.5" = self.buildNodePackage { + name = "cli-0.4.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; + sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; + }; + deps = { + "glob-5.0.0" = self.by-version."glob"."5.0.0"; + }; + peerDependencies = []; }; by-spec."cliff"."0.1.x" = - self.by-version."cliff"."0.1.9"; - by-version."cliff"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "node-cliff-0.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; - name = "cliff-0.1.9.tgz"; - sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; - }) - ]; - buildInputs = - (self.nativeDeps."cliff" or []); - deps = [ - self.by-version."colors"."0.6.2" - self.by-version."eyes"."0.1.8" - self.by-version."winston"."0.8.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cliff" ]; + self.by-version."cliff"."0.1.10"; + by-version."cliff"."0.1.10" = self.buildNodePackage { + name = "cliff-0.1.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + name = "cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }; + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + }; + peerDependencies = []; }; by-spec."codesign"."0.0.9" = self.by-version."codesign"."0.0.9"; - by-version."codesign"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-codesign-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz"; - name = "codesign-0.0.9.tgz"; - sha1 = "2da6b703f1d1cf2a76e8b1d48f44fa922e21b55f"; - }) - ]; - buildInputs = - (self.nativeDeps."codesign" or []); - deps = [ - self.by-version."argparse"."0.1.15" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-logger"."0.0.5" - self.by-version."glob-to-regexp"."0.0.1" - self.by-version."tablify"."0.1.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "codesign" ]; + by-version."codesign"."0.0.9" = self.buildNodePackage { + name = "codesign-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz"; + name = "codesign-0.0.9.tgz"; + sha1 = "2da6b703f1d1cf2a76e8b1d48f44fa922e21b55f"; + }; + deps = { + "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6"; + "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2"; + "tablify-0.1.5" = self.by-version."tablify"."0.1.5"; + }; + peerDependencies = []; }; "codesign" = self.by-version."codesign"."0.0.9"; by-spec."colors"."0.6.2" = self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-colors-0.6.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; + by-version."colors"."0.6.2" = self.buildNodePackage { + name = "colors-0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + peerDependencies = []; }; "colors" = self.by-version."colors"."0.6.2"; by-spec."colors"."0.6.x" = self.by-version."colors"."0.6.2"; - by-spec."colors"."0.x.x" = - self.by-version."colors"."0.6.2"; by-spec."colors".">=0.6.2" = - self.by-version."colors"."0.6.2"; + self.by-version."colors"."1.0.3"; + by-version."colors"."1.0.3" = self.buildNodePackage { + name = "colors-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + name = "colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; + by-spec."colors"."~1.0.3" = + self.by-version."colors"."1.0.3"; by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.5"; - by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-combined-stream-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; - }) - ]; - buildInputs = - (self.nativeDeps."combined-stream" or []); - deps = [ - self.by-version."delayed-stream"."0.0.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "combined-stream" ]; + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = self.buildNodePackage { + name = "combined-stream-0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + peerDependencies = []; }; by-spec."commander".">= 0.5.2" = - self.by-version."commander"."2.3.0"; - by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; - name = "commander-2.3.0.tgz"; - sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; + self.by-version."commander"."2.6.0"; + by-version."commander"."2.6.0" = self.buildNodePackage { + name = "commander-2.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + name = "commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; - by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; - name = "commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; - }) - ]; - buildInputs = - (self.nativeDeps."commander" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "commander" ]; + by-version."commander"."2.1.0" = self.buildNodePackage { + name = "commander-2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."core-util-is"."~1.0.0" = self.by-version."core-util-is"."1.0.1"; - by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-core-util-is-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; - name = "core-util-is-1.0.1.tgz"; - sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; - }) - ]; - buildInputs = - (self.nativeDeps."core-util-is" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "core-util-is" ]; + by-version."core-util-is"."1.0.1" = self.buildNodePackage { + name = "core-util-is-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cryptiles-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }) - ]; - buildInputs = - (self.nativeDeps."cryptiles" or []); - deps = [ - self.by-version."boom"."0.4.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "cryptiles" ]; + by-version."cryptiles"."0.2.2" = self.buildNodePackage { + name = "cryptiles-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; + peerDependencies = []; }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ctype-0.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }) - ]; - buildInputs = - (self.nativeDeps."ctype" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ctype" ]; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = self.buildNodePackage { + name = "ctype-0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."cycle"."1.0.x" = self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-cycle-1.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }) - ]; - buildInputs = - (self.nativeDeps."cycle" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "cycle" ]; + by-version."cycle"."1.0.3" = self.buildNodePackage { + name = "cycle-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."deep-equal"."0.2.1" = self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-deep-equal-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; + by-version."deep-equal"."0.2.1" = self.buildNodePackage { + name = "deep-equal-0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; + name = "deep-equal-0.2.1.tgz"; + sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; + }; + deps = { + }; + peerDependencies = []; }; "deep-equal" = self.by-version."deep-equal"."0.2.1"; by-spec."deep-equal".">=0.2.1" = - self.by-version."deep-equal"."0.2.1"; + self.by-version."deep-equal"."1.0.0"; + by-version."deep-equal"."1.0.0" = self.buildNodePackage { + name = "deep-equal-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz"; + name = "deep-equal-1.0.0.tgz"; + sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."deep-equal"."~0.2.1" = - self.by-version."deep-equal"."0.2.1"; + self.by-version."deep-equal"."0.2.2"; + by-version."deep-equal"."0.2.2" = self.buildNodePackage { + name = "deep-equal-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; + name = "deep-equal-0.2.2.tgz"; + sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + }; + deps = { + }; + peerDependencies = []; + }; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-delayed-stream-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }) - ]; - buildInputs = - (self.nativeDeps."delayed-stream" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "delayed-stream" ]; + by-version."delayed-stream"."0.0.5" = self.buildNodePackage { + name = "delayed-stream-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."docco"."~0.6.2" = self.by-version."docco"."0.6.3"; - by-version."docco"."0.6.3" = lib.makeOverridable self.buildNodePackage { + by-version."docco"."0.6.3" = self.buildNodePackage { name = "docco-0.6.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz"; - name = "docco-0.6.3.tgz"; - sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee"; - }) - ]; - buildInputs = - (self.nativeDeps."docco" or []); - deps = [ - self.by-version."commander"."2.3.0" - self.by-version."marked"."0.3.2" - self.by-version."fs-extra"."0.12.0" - self.by-version."underscore"."1.7.0" - self.by-version."highlight.js"."8.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "docco" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz"; + name = "docco-0.6.3.tgz"; + sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee"; + }; + deps = { + "commander-2.6.0" = self.by-version."commander"."2.6.0"; + "marked-0.3.3" = self.by-version."marked"."0.3.3"; + "fs-extra-0.16.4" = self.by-version."fs-extra"."0.16.4"; + "underscore-1.8.2" = self.by-version."underscore"."1.8.2"; + "highlight.js-8.4.0" = self.by-version."highlight.js"."8.4.0"; + }; + peerDependencies = []; }; by-spec."domelementtype"."1" = - self.by-version."domelementtype"."1.1.1"; - by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-domelementtype-1.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; - name = "domelementtype-1.1.1.tgz"; - sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; - }) - ]; - buildInputs = - (self.nativeDeps."domelementtype" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "domelementtype" ]; + self.by-version."domelementtype"."1.3.0"; + by-version."domelementtype"."1.3.0" = self.buildNodePackage { + name = "domelementtype-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + name = "domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."domhandler"."2.2" = - self.by-version."domhandler"."2.2.0"; - by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domhandler-2.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; - name = "domhandler-2.2.0.tgz"; - sha1 = "ac9febfa988034b43f78ba056ebf7bd373416476"; - }) - ]; - buildInputs = - (self.nativeDeps."domhandler" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domhandler" ]; + self.by-version."domhandler"."2.2.1"; + by-version."domhandler"."2.2.1" = self.buildNodePackage { + name = "domhandler-2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; + name = "domhandler-2.2.1.tgz"; + sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."domutils"."1.3" = self.by-version."domutils"."1.3.0"; - by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; - name = "domutils-1.3.0.tgz"; - sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; + by-version."domutils"."1.3.0" = self.buildNodePackage { + name = "domutils-1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + name = "domutils-1.3.0.tgz"; + sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."domutils"."1.4" = self.by-version."domutils"."1.4.3"; - by-version."domutils"."1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "node-domutils-1.4.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; - name = "domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; - }) - ]; - buildInputs = - (self.nativeDeps."domutils" or []); - deps = [ - self.by-version."domelementtype"."1.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "domutils" ]; + by-version."domutils"."1.4.3" = self.buildNodePackage { + name = "domutils-1.4.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + name = "domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + }; + deps = { + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + }; + peerDependencies = []; }; by-spec."entities"."0.x" = self.by-version."entities"."0.5.0"; - by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-entities-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz"; - name = "entities-0.5.0.tgz"; - sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49"; - }) - ]; - buildInputs = - (self.nativeDeps."entities" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "entities" ]; + by-version."entities"."0.5.0" = self.buildNodePackage { + name = "entities-0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz"; + name = "entities-0.5.0.tgz"; + sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-eyes-0.1.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }) - ]; - buildInputs = - (self.nativeDeps."eyes" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "eyes" ]; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + peerDependencies = []; }; + by-spec."eyes"."~0.1.8" = + self.by-version."eyes"."0.1.8"; by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-forever-agent-0.5.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-agent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "forever-agent" ]; + by-version."forever-agent"."0.5.2" = self.buildNodePackage { + name = "forever-agent-0.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.5" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; + by-version."form-data"."0.1.4" = self.buildNodePackage { + name = "form-data-0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + }; + peerDependencies = []; }; by-spec."framed-msgpack-rpc"."1.1.4" = self.by-version."framed-msgpack-rpc"."1.1.4"; - by-version."framed-msgpack-rpc"."1.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-framed-msgpack-rpc-1.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz"; - name = "framed-msgpack-rpc-1.1.4.tgz"; - sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2"; - }) - ]; - buildInputs = - (self.nativeDeps."framed-msgpack-rpc" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - self.by-version."purepack"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "framed-msgpack-rpc" ]; + by-version."framed-msgpack-rpc"."1.1.4" = self.buildNodePackage { + name = "framed-msgpack-rpc-1.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz"; + name = "framed-msgpack-rpc-1.1.4.tgz"; + sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + }; + peerDependencies = []; }; "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4"; by-spec."fs-extra".">= 0.6.0" = - self.by-version."fs-extra"."0.12.0"; - by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { - name = "node-fs-extra-0.12.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; - name = "fs-extra-0.12.0.tgz"; - sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; - }) - ]; - buildInputs = - (self.nativeDeps."fs-extra" or []); - deps = [ - self.by-version."ncp"."0.6.0" - self.by-version."mkdirp"."0.5.0" - self.by-version."jsonfile"."2.0.0" - self.by-version."rimraf"."2.2.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "fs-extra" ]; + self.by-version."fs-extra"."0.16.4"; + by-version."fs-extra"."0.16.4" = self.buildNodePackage { + name = "fs-extra-0.16.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.4.tgz"; + name = "fs-extra-0.16.4.tgz"; + sha1 = "3e3d3cd6f388e2acbc0fc2e0202f0533ec0507b1"; + }; + deps = { + "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; + "rimraf-2.3.1" = self.by-version."rimraf"."2.3.1"; + }; + peerDependencies = []; }; by-spec."glob".">= 3.1.4" = - self.by-version."glob"."4.0.6"; - by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-4.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; - name = "glob-4.0.6.tgz"; - sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = [ - self.by-version."graceful-fs"."3.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."minimatch"."1.0.0" - self.by-version."once"."1.3.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; + self.by-version."glob"."5.0.0"; + by-version."glob"."5.0.0" = self.buildNodePackage { + name = "glob-5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-5.0.0.tgz"; + name = "glob-5.0.0.tgz"; + sha1 = "bb00d4e340932eb101dc2a30e4127ddd51ed15ed"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = []; + }; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.0"; + by-version."glob"."4.5.0" = self.buildNodePackage { + name = "glob-4.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.5.0.tgz"; + name = "glob-4.5.0.tgz"; + sha1 = "d6511322e9d5c9bc689f20eb7348f00489723882"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; + "once-1.3.1" = self.by-version."once"."1.3.1"; + }; + peerDependencies = []; }; by-spec."glob-to-regexp".">=0.0.1" = - self.by-version."glob-to-regexp"."0.0.1"; - by-version."glob-to-regexp"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-glob-to-regexp-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.1.tgz"; - name = "glob-to-regexp-0.0.1.tgz"; - sha1 = "2a5f79f2ed3233d4ee9ea7b6412547000c3f9d75"; - }) - ]; - buildInputs = - (self.nativeDeps."glob-to-regexp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "glob-to-regexp" ]; + self.by-version."glob-to-regexp"."0.0.2"; + by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage { + name = "glob-to-regexp-0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz"; + name = "glob-to-regexp-0.0.2.tgz"; + sha1 = "82cb3c797594b47890f180f015c1773601374b91"; + }; + deps = { + }; + peerDependencies = []; }; - by-spec."gpg-wrapper"."0.0.47" = - self.by-version."gpg-wrapper"."0.0.47"; - by-version."gpg-wrapper"."0.0.47" = lib.makeOverridable self.buildNodePackage { - name = "node-gpg-wrapper-0.0.47"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-0.0.47.tgz"; - name = "gpg-wrapper-0.0.47.tgz"; - sha1 = "5de253269cb999e3e928a375971c7613bcb29d36"; - }) - ]; - buildInputs = - (self.nativeDeps."gpg-wrapper" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-spawn"."0.0.10" - self.by-version."iced-utils"."0.1.21" - self.by-version."pgp-utils"."0.0.27" - ]; - peerDependencies = [ - ]; - passthru.names = [ "gpg-wrapper" ]; + by-spec."gpg-wrapper".">=1.0.3" = + self.by-version."gpg-wrapper"."1.0.3"; + by-version."gpg-wrapper"."1.0.3" = self.buildNodePackage { + name = "gpg-wrapper-1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.3.tgz"; + name = "gpg-wrapper-1.0.3.tgz"; + sha1 = "826260e7ae53932f80574e04240bbb8999227cd1"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "spotty-1.0.0" = self.by-version."spotty"."1.0.0"; + }; + peerDependencies = []; }; - "gpg-wrapper" = self.by-version."gpg-wrapper"."0.0.47"; - by-spec."graceful-fs"."^3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; + "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.3"; + by-spec."graceful-fs"."^3.0.5" = + self.by-version."graceful-fs"."3.0.5"; + by-version."graceful-fs"."3.0.5" = self.buildNodePackage { + name = "graceful-fs-3.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"; + name = "graceful-fs-3.0.5.tgz"; + sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; - by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-hawk-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - name = "hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.9.1" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; + by-version."hawk"."1.0.0" = self.buildNodePackage { + name = "hawk-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; + peerDependencies = []; }; by-spec."highlight.js".">= 8.0.x" = - self.by-version."highlight.js"."8.2.0"; - by-version."highlight.js"."8.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-highlight.js-8.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.2.0.tgz"; - name = "highlight.js-8.2.0.tgz"; - sha1 = "31ac0ea5d20f88f562948e7e8eb5a62e9e8c5e43"; - }) - ]; - buildInputs = - (self.nativeDeps."highlight.js" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "highlight.js" ]; + self.by-version."highlight.js"."8.4.0"; + by-version."highlight.js"."8.4.0" = self.buildNodePackage { + name = "highlight.js-8.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.4.0.tgz"; + name = "highlight.js-8.4.0.tgz"; + sha1 = "dc0d05b8dc9b110f13bce52cb96fd1e0c6bc791c"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-hoek-0.9.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; + by-version."hoek"."0.9.1" = self.buildNodePackage { + name = "hoek-0.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."htmlparser2"."~3.4.0" = self.by-version."htmlparser2"."3.4.0"; - by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-htmlparser2-3.4.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; - name = "htmlparser2-3.4.0.tgz"; - sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; - }) - ]; - buildInputs = - (self.nativeDeps."htmlparser2" or []); - deps = [ - self.by-version."domhandler"."2.2.0" - self.by-version."domutils"."1.3.0" - self.by-version."domelementtype"."1.1.1" - self.by-version."readable-stream"."1.1.13" - ]; - peerDependencies = [ - ]; - passthru.names = [ "htmlparser2" ]; + by-version."htmlparser2"."3.4.0" = self.buildNodePackage { + name = "htmlparser2-3.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; + name = "htmlparser2-3.4.0.tgz"; + sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; + }; + deps = { + "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1"; + "domutils-1.3.0" = self.by-version."domutils"."1.3.0"; + "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = []; }; by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-http-signature-0.10.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature" or []); - deps = [ - self.by-version."assert-plus"."0.1.2" - self.by-version."asn1"."0.1.11" - self.by-version."ctype"."0.5.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = self.buildNodePackage { + name = "http-signature-0.10.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; + peerDependencies = []; }; by-spec."iced-coffee-script"."~1.7.1-c" = self.by-version."iced-coffee-script"."1.7.1-g"; - by-version."iced-coffee-script"."1.7.1-g" = lib.makeOverridable self.buildNodePackage { + by-version."iced-coffee-script"."1.7.1-g" = self.buildNodePackage { name = "iced-coffee-script-1.7.1-g"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz"; - name = "iced-coffee-script-1.7.1-g.tgz"; - sha1 = "41f9ccabe113bade608d519c10a41406a62c170b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-coffee-script" or []); - deps = [ - self.by-version."docco"."0.6.3" - self.by-version."iced-runtime"."1.0.1" - self.by-version."mkdirp"."0.3.5" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-coffee-script" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz"; + name = "iced-coffee-script-1.7.1-g.tgz"; + sha1 = "41f9ccabe113bade608d519c10a41406a62c170b"; + }; + deps = { + "docco-0.6.3" = self.by-version."docco"."0.6.3"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; + }; + peerDependencies = []; }; "iced-coffee-script" = self.by-version."iced-coffee-script"."1.7.1-g"; by-spec."iced-data-structures"."0.0.5" = self.by-version."iced-data-structures"."0.0.5"; - by-version."iced-data-structures"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-data-structures-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz"; - name = "iced-data-structures-0.0.5.tgz"; - sha1 = "21de124f847fdeeb88f32cf232d3e3e600e05db4"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-data-structures" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-data-structures" ]; + by-version."iced-data-structures"."0.0.5" = self.buildNodePackage { + name = "iced-data-structures-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz"; + name = "iced-data-structures-0.0.5.tgz"; + sha1 = "21de124f847fdeeb88f32cf232d3e3e600e05db4"; + }; + deps = { + }; + peerDependencies = []; }; "iced-data-structures" = self.by-version."iced-data-structures"."0.0.5"; by-spec."iced-db"."0.0.4" = self.by-version."iced-db"."0.0.4"; - by-version."iced-db"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-db-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz"; - name = "iced-db-0.0.4.tgz"; - sha1 = "355bf9808998076013a0850ee33c6905dfb85a00"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-db" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-utils"."0.1.21" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-db" ]; + by-version."iced-db"."0.0.4" = self.buildNodePackage { + name = "iced-db-0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz"; + name = "iced-db-0.0.4.tgz"; + sha1 = "355bf9808998076013a0850ee33c6905dfb85a00"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + }; + peerDependencies = []; }; "iced-db" = self.by-version."iced-db"."0.0.4"; by-spec."iced-error"."0.0.9" = self.by-version."iced-error"."0.0.9"; - by-version."iced-error"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-error-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz"; - name = "iced-error-0.0.9.tgz"; - sha1 = "c7c3057614c0a187d96b3d18c6d520e6b872ed37"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-error" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-error" ]; + by-version."iced-error"."0.0.9" = self.buildNodePackage { + name = "iced-error-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz"; + name = "iced-error-0.0.9.tgz"; + sha1 = "c7c3057614c0a187d96b3d18c6d520e6b872ed37"; + }; + deps = { + }; + peerDependencies = []; }; "iced-error" = self.by-version."iced-error"."0.0.9"; by-spec."iced-error".">=0.0.8" = @@ -1034,912 +905,727 @@ self.by-version."iced-error"."0.0.9"; by-spec."iced-expect"."0.0.3" = self.by-version."iced-expect"."0.0.3"; - by-version."iced-expect"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-expect-0.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz"; - name = "iced-expect-0.0.3.tgz"; - sha1 = "206f271f27b200b9b538e2c0ca66a70209be1238"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-expect" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-expect" ]; + by-version."iced-expect"."0.0.3" = self.buildNodePackage { + name = "iced-expect-0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz"; + name = "iced-expect-0.0.3.tgz"; + sha1 = "206f271f27b200b9b538e2c0ca66a70209be1238"; + }; + deps = { + }; + peerDependencies = []; }; "iced-expect" = self.by-version."iced-expect"."0.0.3"; by-spec."iced-lock"."^1.0.1" = self.by-version."iced-lock"."1.0.1"; - by-version."iced-lock"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-lock-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz"; - name = "iced-lock-1.0.1.tgz"; - sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-lock" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-lock" ]; + by-version."iced-lock"."1.0.1" = self.buildNodePackage { + name = "iced-lock-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz"; + name = "iced-lock-1.0.1.tgz"; + sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "iced-lock" = self.by-version."iced-lock"."1.0.1"; by-spec."iced-logger"."0.0.5" = self.by-version."iced-logger"."0.0.5"; - by-version."iced-logger"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-logger-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz"; - name = "iced-logger-0.0.5.tgz"; - sha1 = "501852a410691cf7e9542598e04dfbfdadc51486"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-logger" or []); - deps = [ - self.by-version."colors"."0.6.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-logger" ]; + by-version."iced-logger"."0.0.5" = self.buildNodePackage { + name = "iced-logger-0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz"; + name = "iced-logger-0.0.5.tgz"; + sha1 = "501852a410691cf7e9542598e04dfbfdadc51486"; + }; + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + peerDependencies = []; }; "iced-logger" = self.by-version."iced-logger"."0.0.5"; by-spec."iced-logger".">=0.0.3" = - self.by-version."iced-logger"."0.0.5"; + self.by-version."iced-logger"."0.0.6"; + by-version."iced-logger"."0.0.6" = self.buildNodePackage { + name = "iced-logger-0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.6.tgz"; + name = "iced-logger-0.0.6.tgz"; + sha1 = "3f38081e4df4742aab09b86bb0adf8ea6c12de82"; + }; + deps = { + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + peerDependencies = []; + }; by-spec."iced-runtime".">=0.0.1" = - self.by-version."iced-runtime"."1.0.1"; - by-version."iced-runtime"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-runtime-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.1.tgz"; - name = "iced-runtime-1.0.1.tgz"; - sha1 = "b2a8f4544241408d076c581ffa97c67d32e3d49b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-runtime" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-runtime" ]; + self.by-version."iced-runtime"."1.0.2"; + by-version."iced-runtime"."1.0.2" = self.buildNodePackage { + name = "iced-runtime-1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz"; + name = "iced-runtime-1.0.2.tgz"; + sha1 = "a949a7cf49451175d3f6168d84997da27c4e6b70"; + }; + deps = { + }; + peerDependencies = []; }; - "iced-runtime" = self.by-version."iced-runtime"."1.0.1"; + "iced-runtime" = self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime".">=0.0.1 <2.0.0-0" = - self.by-version."iced-runtime"."1.0.1"; + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime"."^1.0.0" = - self.by-version."iced-runtime"."1.0.1"; + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-runtime"."^1.0.1" = - self.by-version."iced-runtime"."1.0.1"; - by-spec."iced-spawn"."0.0.10" = - self.by-version."iced-spawn"."0.0.10"; - by-version."iced-spawn"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-spawn-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-0.0.10.tgz"; - name = "iced-spawn-0.0.10.tgz"; - sha1 = "bef06e4fd98b73a519e6781bc3a4bdf2e78054f4"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-spawn" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - self.by-version."semver"."2.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-spawn" ]; - }; - "iced-spawn" = self.by-version."iced-spawn"."0.0.10"; + self.by-version."iced-runtime"."1.0.2"; + by-spec."iced-runtime"."^1.0.2" = + self.by-version."iced-runtime"."1.0.2"; by-spec."iced-spawn".">=0.0.8" = - self.by-version."iced-spawn"."0.0.10"; - by-spec."iced-test".">=0.0.16" = - self.by-version."iced-test"."0.0.19"; - by-version."iced-test"."0.0.19" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-test-0.0.19"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.19.tgz"; - name = "iced-test-0.0.19.tgz"; - sha1 = "0aff4cfa5170a0ebf9d888695b233e68cf60c634"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-test" or []); - deps = [ - self.by-version."colors"."0.6.2" - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."minimist"."1.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-test" ]; + self.by-version."iced-spawn"."1.0.0"; + by-version."iced-spawn"."1.0.0" = self.buildNodePackage { + name = "iced-spawn-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-1.0.0.tgz"; + name = "iced-spawn-1.0.0.tgz"; + sha1 = "dab91968cb46f9c05baadd126a5abb53c5d7d1df"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "semver-4.3.1" = self.by-version."semver"."4.3.1"; + }; + peerDependencies = []; }; - "iced-test" = self.by-version."iced-test"."0.0.19"; + by-spec."iced-spawn".">=1.0.0" = + self.by-version."iced-spawn"."1.0.0"; + "iced-spawn" = self.by-version."iced-spawn"."1.0.0"; + by-spec."iced-test".">=0.0.16" = + self.by-version."iced-test"."0.0.21"; + by-version."iced-test"."0.0.21" = self.buildNodePackage { + name = "iced-test-0.0.21"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz"; + name = "iced-test-0.0.21.tgz"; + sha1 = "8e7c347aa744eb4dddd786fcd430913be8bd83c7"; + }; + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + }; + peerDependencies = []; + }; + "iced-test" = self.by-version."iced-test"."0.0.21"; by-spec."iced-utils"."0.1.20" = self.by-version."iced-utils"."0.1.20"; - by-version."iced-utils"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-utils-0.1.20"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz"; - name = "iced-utils-0.1.20.tgz"; - sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-utils" ]; + by-version."iced-utils"."0.1.20" = self.buildNodePackage { + name = "iced-utils-0.1.20"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz"; + name = "iced-utils-0.1.20.tgz"; + sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "iced-utils" = self.by-version."iced-utils"."0.1.20"; by-spec."iced-utils".">=0.1.11" = - self.by-version."iced-utils"."0.1.21"; - by-version."iced-utils"."0.1.21" = lib.makeOverridable self.buildNodePackage { - name = "node-iced-utils-0.1.21"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.21.tgz"; - name = "iced-utils-0.1.21.tgz"; - sha1 = "6f9fb61232c75f365340151794082a718ace436b"; - }) - ]; - buildInputs = - (self.nativeDeps."iced-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "iced-utils" ]; + self.by-version."iced-utils"."0.1.22"; + by-version."iced-utils"."0.1.22" = self.buildNodePackage { + name = "iced-utils-0.1.22"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz"; + name = "iced-utils-0.1.22.tgz"; + sha1 = "931925d9d39655a392fd337cefb2e111f503bb15"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."iced-utils".">=0.1.16" = - self.by-version."iced-utils"."0.1.21"; + self.by-version."iced-utils"."0.1.22"; by-spec."iced-utils".">=0.1.18" = - self.by-version."iced-utils"."0.1.21"; + self.by-version."iced-utils"."0.1.22"; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = self.buildNodePackage { + name = "inflight-1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }; + deps = { + "once-1.3.1" = self.by-version."once"."1.3.1"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = []; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inherits-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; by-spec."ipv6"."~3.1.1" = self.by-version."ipv6"."3.1.1"; - by-version."ipv6"."3.1.1" = lib.makeOverridable self.buildNodePackage { + by-version."ipv6"."3.1.1" = self.buildNodePackage { name = "ipv6-3.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz"; - name = "ipv6-3.1.1.tgz"; - sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c"; - }) - ]; - buildInputs = - (self.nativeDeps."ipv6" or []); - deps = [ - self.by-version."sprintf"."0.1.4" - self.by-version."cli"."0.4.5" - self.by-version."cliff"."0.1.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ipv6" ]; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz"; + name = "ipv6-3.1.1.tgz"; + sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c"; + }; + deps = { + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; + "cli-0.4.5" = self.by-version."cli"."0.4.5"; + "cliff-0.1.10" = self.by-version."cliff"."0.1.10"; + }; + peerDependencies = []; }; by-spec."isarray"."0.0.1" = self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-isarray-0.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }) - ]; - buildInputs = - (self.nativeDeps."isarray" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "isarray" ]; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + peerDependencies = []; + }; + by-spec."isstream"."0.1.x" = + self.by-version."isstream"."0.1.1"; + by-version."isstream"."0.1.1" = self.buildNodePackage { + name = "isstream-0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; + name = "isstream-0.1.1.tgz"; + sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."json-stringify-safe"."~5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-json-stringify-safe-5.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; + by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage { + name = "json-stringify-safe-5.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."jsonfile"."^2.0.0" = self.by-version."jsonfile"."2.0.0"; - by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-jsonfile-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; - name = "jsonfile-2.0.0.tgz"; - sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; - }) - ]; - buildInputs = - (self.nativeDeps."jsonfile" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "jsonfile" ]; + by-version."jsonfile"."2.0.0" = self.buildNodePackage { + name = "jsonfile-2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."kbpgp".">=1.0.2" = - self.by-version."kbpgp"."1.0.5"; - by-version."kbpgp"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-kbpgp-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.0.5.tgz"; - name = "kbpgp-1.0.5.tgz"; - sha1 = "5dea54ffbe648494bd4afcdadae1323e1de909fa"; - }) - ]; - buildInputs = - (self.nativeDeps."kbpgp" or []); - deps = [ - self.by-version."bn"."1.0.1" - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."keybase-compressjs"."1.0.1-c" - self.by-version."keybase-ecurve"."1.0.0" - self.by-version."pgp-utils"."0.0.27" - self.by-version."purepack"."1.0.1" - self.by-version."triplesec"."3.0.19" - ]; - peerDependencies = [ - ]; - passthru.names = [ "kbpgp" ]; + self.by-version."kbpgp"."2.0.8"; + by-version."kbpgp"."2.0.8" = self.buildNodePackage { + name = "kbpgp-2.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.8.tgz"; + name = "kbpgp-2.0.8.tgz"; + sha1 = "5ede9539bce3564a53f8be72a75c7619414b6e08"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; + "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; }; - "kbpgp" = self.by-version."kbpgp"."1.0.5"; + "kbpgp" = self.by-version."kbpgp"."2.0.8"; by-spec."kbpgp"."^1.0.2" = - self.by-version."kbpgp"."1.0.5"; + self.by-version."kbpgp"."1.2.0"; + by-version."kbpgp"."1.2.0" = self.buildNodePackage { + name = "kbpgp-1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.2.0.tgz"; + name = "kbpgp-1.2.0.tgz"; + sha1 = "4305a67a740fb31843b4313b60a6137f2b93ddba"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; + "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "purepack-1.0.1" = self.by-version."purepack"."1.0.1"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; + }; + by-spec."kbpgp"."^2.0.0" = + self.by-version."kbpgp"."2.0.8"; by-spec."keybase-compressjs"."^1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c"; - by-version."keybase-compressjs"."1.0.1-c" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-compressjs-1.0.1-c"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz"; - name = "keybase-compressjs-1.0.1-c.tgz"; - sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-compressjs" or []); - deps = [ - self.by-version."commander"."2.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-compressjs" ]; + by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage { + name = "keybase-compressjs-1.0.1-c"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz"; + name = "keybase-compressjs-1.0.1-c.tgz"; + sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f"; + }; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + }; + peerDependencies = []; }; by-spec."keybase-ecurve"."^1.0.0" = self.by-version."keybase-ecurve"."1.0.0"; - by-version."keybase-ecurve"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-ecurve-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz"; - name = "keybase-ecurve-1.0.0.tgz"; - sha1 = "c6bc72adda4603fd3184fee7e99694ed8fd69ad2"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-ecurve" or []); - deps = [ - self.by-version."bn"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-ecurve" ]; + by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage { + name = "keybase-ecurve-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz"; + name = "keybase-ecurve-1.0.0.tgz"; + sha1 = "c6bc72adda4603fd3184fee7e99694ed8fd69ad2"; + }; + deps = { + "bn-1.0.1" = self.by-version."bn"."1.0.1"; + }; + peerDependencies = []; }; by-spec."keybase-path"."0.0.15" = self.by-version."keybase-path"."0.0.15"; - by-version."keybase-path"."0.0.15" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-path-0.0.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz"; - name = "keybase-path-0.0.15.tgz"; - sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-path" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-path" ]; + by-version."keybase-path"."0.0.15" = self.buildNodePackage { + name = "keybase-path-0.0.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz"; + name = "keybase-path-0.0.15.tgz"; + sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; "keybase-path" = self.by-version."keybase-path"."0.0.15"; - by-spec."keybase-proofs"."^1.1.3" = - self.by-version."keybase-proofs"."1.1.3"; - by-version."keybase-proofs"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-keybase-proofs-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-1.1.3.tgz"; - name = "keybase-proofs-1.1.3.tgz"; - sha1 = "f2a1a77c7e978a70480fb6ef4fb236f413f729da"; - }) - ]; - buildInputs = - (self.nativeDeps."keybase-proofs" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."pgp-utils"."0.0.27" - self.by-version."triplesec"."3.0.19" - ]; - peerDependencies = [ - ]; - passthru.names = [ "keybase-proofs" ]; + by-spec."keybase-proofs"."^2.0.13" = + self.by-version."keybase-proofs"."2.0.15"; + by-version."keybase-proofs"."2.0.15" = self.buildNodePackage { + name = "keybase-proofs-2.0.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.15.tgz"; + name = "keybase-proofs-2.0.15.tgz"; + sha1 = "d9e0c265e005095f749058825a7f0db3ab5bcedc"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28"; + "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19"; + }; + peerDependencies = []; }; - "keybase-proofs" = self.by-version."keybase-proofs"."1.1.3"; + "keybase-proofs" = self.by-version."keybase-proofs"."2.0.15"; by-spec."libkeybase"."^0.0.6" = self.by-version."libkeybase"."0.0.6"; - by-version."libkeybase"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-libkeybase-0.0.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz"; - name = "libkeybase-0.0.6.tgz"; - sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e"; - }) - ]; - buildInputs = - (self.nativeDeps."libkeybase" or []); - deps = [ - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-logger"."0.0.5" - self.by-version."iced-runtime"."1.0.1" - self.by-version."kbpgp"."1.0.5" - self.by-version."tweetnacl"."0.12.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "libkeybase" ]; + by-version."libkeybase"."0.0.6" = self.buildNodePackage { + name = "libkeybase-0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz"; + name = "libkeybase-0.0.6.tgz"; + sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e"; + }; + deps = { + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "kbpgp-1.2.0" = self.by-version."kbpgp"."1.2.0"; + "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2"; + }; + peerDependencies = []; }; "libkeybase" = self.by-version."libkeybase"."0.0.6"; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-lru-cache-2.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; by-spec."marked".">= 0.2.7" = - self.by-version."marked"."0.3.2"; - by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "marked-0.3.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz"; - name = "marked-0.3.2.tgz"; - sha1 = "015db158864438f24a64bdd61a0428b418706d09"; - }) - ]; - buildInputs = - (self.nativeDeps."marked" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "marked" ]; + self.by-version."marked"."0.3.3"; + by-version."marked"."0.3.3" = self.buildNodePackage { + name = "marked-0.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz"; + name = "marked-0.3.3.tgz"; + sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."merkle-tree"."0.0.12" = self.by-version."merkle-tree"."0.0.12"; - by-version."merkle-tree"."0.0.12" = lib.makeOverridable self.buildNodePackage { - name = "node-merkle-tree-0.0.12"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz"; - name = "merkle-tree-0.0.12.tgz"; - sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f"; - }) - ]; - buildInputs = - (self.nativeDeps."merkle-tree" or []); - deps = [ - self.by-version."deep-equal"."0.2.1" - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - self.by-version."iced-utils"."0.1.21" - ]; - peerDependencies = [ - ]; - passthru.names = [ "merkle-tree" ]; + by-version."merkle-tree"."0.0.12" = self.buildNodePackage { + name = "merkle-tree-0.0.12"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz"; + name = "merkle-tree-0.0.12.tgz"; + sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f"; + }; + deps = { + "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2"; + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22"; + }; + peerDependencies = []; }; "merkle-tree" = self.by-version."merkle-tree"."0.0.12"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-1.2.11"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."minimatch"."^1.0.0" = - self.by-version."minimatch"."1.0.0"; - by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimatch-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - name = "minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = [ - self.by-version."lru-cache"."2.5.0" - self.by-version."sigmund"."1.0.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.1"; + by-version."minimatch"."2.0.1" = self.buildNodePackage { + name = "minimatch-2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; + name = "minimatch-2.0.1.tgz"; + sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37"; + }; + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = []; }; by-spec."minimist".">=0.0.8" = self.by-version."minimist"."1.1.0"; - by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-1.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; - name = "minimist-1.1.0.tgz"; - sha1 = "cdf225e8898f840a258ded44fc91776770afdc93"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-version."minimist"."1.1.0" = self.buildNodePackage { + name = "minimist-1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; + name = "minimist-1.1.0.tgz"; + sha1 = "cdf225e8898f840a258ded44fc91776770afdc93"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."minimist"."~0.0.1" = self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.10"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; + by-version."minimist"."0.0.10" = self.buildNodePackage { + name = "minimist-0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."mkdirp"."0.3.5" = self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "node-mkdirp-0.3.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; + by-version."mkdirp"."0.3.5" = self.buildNodePackage { + name = "mkdirp-0.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + peerDependencies = []; }; "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mkdirp"."^0.5.0" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; by-spec."mkdirp"."~0.3.5" = self.by-version."mkdirp"."0.3.5"; by-spec."more-entropy".">=0.0.7" = self.by-version."more-entropy"."0.0.7"; - by-version."more-entropy"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-more-entropy-0.0.7"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz"; - name = "more-entropy-0.0.7.tgz"; - sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5"; - }) - ]; - buildInputs = - (self.nativeDeps."more-entropy" or []); - deps = [ - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "more-entropy" ]; + by-version."more-entropy"."0.0.7" = self.buildNodePackage { + name = "more-entropy-0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz"; + name = "more-entropy-0.0.7.tgz"; + sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5"; + }; + deps = { + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."mute-stream"."~0.0.4" = self.by-version."mute-stream"."0.0.4"; - by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "node-mute-stream-0.0.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - name = "mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }) - ]; - buildInputs = - (self.nativeDeps."mute-stream" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "mute-stream" ]; - }; - by-spec."ncp"."^0.6.0" = - self.by-version."ncp"."0.6.0"; - by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "ncp-0.6.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; - name = "ncp-0.6.0.tgz"; - sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; - }) - ]; - buildInputs = - (self.nativeDeps."ncp" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ncp" ]; + by-version."mute-stream"."0.0.4" = self.buildNodePackage { + name = "mute-stream-0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + name = "mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."network-byte-order"."~0.2.0" = self.by-version."network-byte-order"."0.2.0"; - by-version."network-byte-order"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-network-byte-order-0.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz"; - name = "network-byte-order-0.2.0.tgz"; - sha1 = "6ac11bf44bf610daeddbe90a09a5c817c6e0d2b3"; - }) - ]; - buildInputs = - (self.nativeDeps."network-byte-order" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "network-byte-order" ]; + by-version."network-byte-order"."0.2.0" = self.buildNodePackage { + name = "network-byte-order-0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz"; + name = "network-byte-order-0.2.0.tgz"; + sha1 = "6ac11bf44bf610daeddbe90a09a5c817c6e0d2b3"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-node-uuid-1.4.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = self.buildNodePackage { + name = "node-uuid-1.4.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-oauth-sign-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }) - ]; - buildInputs = - (self.nativeDeps."oauth-sign" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "oauth-sign" ]; + by-version."oauth-sign"."0.3.0" = self.buildNodePackage { + name = "oauth-sign-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."once"."^1.3.0" = self.by-version."once"."1.3.1"; - by-version."once"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-once-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; - name = "once-1.3.1.tgz"; - sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f"; - }) - ]; - buildInputs = - (self.nativeDeps."once" or []); - deps = [ - self.by-version."wrappy"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "once" ]; + by-version."once"."1.3.1" = self.buildNodePackage { + name = "once-1.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; + name = "once-1.3.1.tgz"; + sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f"; + }; + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = []; }; by-spec."optimist"."0.6.1" = self.by-version."optimist"."0.6.1"; - by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-optimist-0.6.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - name = "optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = [ - self.by-version."wordwrap"."0.0.2" - self.by-version."minimist"."0.0.10" - ]; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; + by-version."optimist"."0.6.1" = self.buildNodePackage { + name = "optimist-0.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + name = "optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + deps = { + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + peerDependencies = []; }; "optimist" = self.by-version."optimist"."0.6.1"; - by-spec."pgp-utils".">=0.0.21" = + by-spec."pgp-utils"."0.0.27" = self.by-version."pgp-utils"."0.0.27"; - by-version."pgp-utils"."0.0.27" = lib.makeOverridable self.buildNodePackage { - name = "node-pgp-utils-0.0.27"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz"; - name = "pgp-utils-0.0.27.tgz"; - sha1 = "3c9afdc0c5d0674bd78ed5009e2d0aec20be32b3"; - }) - ]; - buildInputs = - (self.nativeDeps."pgp-utils" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-runtime"."1.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "pgp-utils" ]; + by-version."pgp-utils"."0.0.27" = self.buildNodePackage { + name = "pgp-utils-0.0.27"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz"; + name = "pgp-utils-0.0.27.tgz"; + sha1 = "3c9afdc0c5d0674bd78ed5009e2d0aec20be32b3"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; + }; + by-spec."pgp-utils".">=0.0.21" = + self.by-version."pgp-utils"."0.0.28"; + by-version."pgp-utils"."0.0.28" = self.buildNodePackage { + name = "pgp-utils-0.0.28"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.28.tgz"; + name = "pgp-utils-0.0.28.tgz"; + sha1 = "fe29f874cb3f32d75daac79a33661b831a2e3add"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; }; by-spec."pgp-utils".">=0.0.22" = - self.by-version."pgp-utils"."0.0.27"; - "pgp-utils" = self.by-version."pgp-utils"."0.0.27"; + self.by-version."pgp-utils"."0.0.28"; + "pgp-utils" = self.by-version."pgp-utils"."0.0.28"; by-spec."pgp-utils".">=0.0.25" = - self.by-version."pgp-utils"."0.0.27"; + self.by-version."pgp-utils"."0.0.28"; + by-spec."pgp-utils".">=0.0.28" = + self.by-version."pgp-utils"."0.0.28"; by-spec."pkginfo"."0.3.x" = self.by-version."pkginfo"."0.3.0"; - by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-pkginfo-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; - name = "pkginfo-0.3.0.tgz"; - sha1 = "726411401039fe9b009eea86614295d5f3a54276"; - }) - ]; - buildInputs = - (self.nativeDeps."pkginfo" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "pkginfo" ]; + by-version."pkginfo"."0.3.0" = self.buildNodePackage { + name = "pkginfo-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."progress"."1.1.3" = self.by-version."progress"."1.1.3"; - by-version."progress"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-progress-1.1.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz"; - name = "progress-1.1.3.tgz"; - sha1 = "42f89c5fc3b6f0408a0bdd68993b174f96aababf"; - }) - ]; - buildInputs = - (self.nativeDeps."progress" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "progress" ]; + by-version."progress"."1.1.3" = self.buildNodePackage { + name = "progress-1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz"; + name = "progress-1.1.3.tgz"; + sha1 = "42f89c5fc3b6f0408a0bdd68993b174f96aababf"; + }; + deps = { + }; + peerDependencies = []; }; "progress" = self.by-version."progress"."1.1.3"; by-spec."progress"."~1.1.2" = self.by-version."progress"."1.1.8"; - by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage { - name = "node-progress-1.1.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - name = "progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }) - ]; - buildInputs = - (self.nativeDeps."progress" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "progress" ]; + by-version."progress"."1.1.8" = self.buildNodePackage { + name = "progress-1.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + name = "progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = self.buildNodePackage { + name = "punycode-1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + name = "punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."purepack"."1.0.1" = self.by-version."purepack"."1.0.1"; - by-version."purepack"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-purepack-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz"; - name = "purepack-1.0.1.tgz"; - sha1 = "9592f35bc22279a777885d3de04acc3555994f68"; - }) - ]; - buildInputs = - (self.nativeDeps."purepack" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "purepack" ]; + by-version."purepack"."1.0.1" = self.buildNodePackage { + name = "purepack-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz"; + name = "purepack-1.0.1.tgz"; + sha1 = "9592f35bc22279a777885d3de04acc3555994f68"; + }; + deps = { + }; + peerDependencies = []; }; "purepack" = self.by-version."purepack"."1.0.1"; by-spec."purepack".">=1" = @@ -1948,199 +1634,141 @@ self.by-version."purepack"."1.0.1"; by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-0.6.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; + by-version."qs"."0.6.6" = self.buildNodePackage { + name = "qs-0.6.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + deps = { + }; + peerDependencies = []; }; - by-spec."read"."~1.0.5" = + by-spec."read"."keybase/read" = self.by-version."read"."1.0.5"; - by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-read-1.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - name = "read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read" or []); - deps = [ - self.by-version."mute-stream"."0.0.4" - ]; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; + by-version."read"."1.0.5" = self.buildNodePackage { + name = "read-1.0.5"; + bin = false; + src = fetchgit { + url = "git://github.com/keybase/read"; + rev = "740ae6a1a72a96984ae3527eb0ce0066c9fc8d47"; + sha256 = "927ce6e6e88c80c54b434261afb5717630568b6979afffc6828c4fc0335e22ec"; + }; + deps = { + "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; + }; + peerDependencies = []; }; "read" = self.by-version."read"."1.0.5"; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage { - name = "node-readable-stream-1.1.13"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = [ - self.by-version."core-util-is"."1.0.1" - self.by-version."isarray"."0.0.1" - self.by-version."string_decoder"."0.10.31" - self.by-version."inherits"."2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; + by-version."readable-stream"."1.1.13" = self.buildNodePackage { + name = "readable-stream-1.1.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = []; }; by-spec."request"."2.30.0" = self.by-version."request"."2.30.0"; - by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.30.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; - name = "request-2.30.0.tgz"; - sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.9.15" - self.by-version."form-data"."0.1.4" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; + by-version."request"."2.30.0" = self.buildNodePackage { + name = "request-2.30.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + name = "request-2.30.0.tgz"; + sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; + }; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + }; + peerDependencies = []; }; "request" = self.by-version."request"."2.30.0"; by-spec."rimraf"."^2.2.8" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; + self.by-version."rimraf"."2.3.1"; + by-version."rimraf"."2.3.1" = self.buildNodePackage { + name = "rimraf-2.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz"; + name = "rimraf-2.3.1.tgz"; + sha1 = "f83df78c168d5daf9f021e8e092e7a165898ee75"; + }; + deps = { + "glob-4.5.0" = self.by-version."glob"."4.5.0"; + }; + peerDependencies = []; }; - by-spec."semver"."2.2.1" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - "semver" = self.by-version."semver"."2.2.1"; - by-spec."semver"."~2.2.1" = - self.by-version."semver"."2.2.1"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-sigmund-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; + by-spec."semver".">=2.2.1" = + self.by-version."semver"."4.3.1"; + by-version."semver"."4.3.1" = self.buildNodePackage { + name = "semver-4.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.3.1.tgz"; + name = "semver-4.3.1.tgz"; + sha1 = "beb0129575b95f76110b29af08d370fd9eeb34bf"; + }; + deps = { + }; + peerDependencies = []; }; + by-spec."semver"."^4.0.0" = + self.by-version."semver"."4.3.1"; + "semver" = self.by-version."semver"."4.3.1"; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sntp-0.2.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }) - ]; - buildInputs = - (self.nativeDeps."sntp" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "sntp" ]; + by-version."sntp"."0.2.4" = self.buildNodePackage { + name = "sntp-0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; + peerDependencies = []; }; by-spec."socks5-client"."0.x" = self.by-version."socks5-client"."0.3.6"; - by-version."socks5-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-client-0.3.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz"; - name = "socks5-client-0.3.6.tgz"; - sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-client" or []); - deps = [ - self.by-version."ipv6"."3.1.1" - self.by-version."network-byte-order"."0.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-client" ]; + by-version."socks5-client"."0.3.6" = self.buildNodePackage { + name = "socks5-client-0.3.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz"; + name = "socks5-client-0.3.6.tgz"; + sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1"; + }; + deps = { + "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1"; + "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0"; + }; + peerDependencies = []; }; by-spec."socks5-client"."^0.3.6" = self.by-version."socks5-client"."0.3.6"; @@ -2149,370 +1777,300 @@ self.by-version."socks5-client"."0.3.6"; by-spec."socks5-http-client"."^0.1.6" = self.by-version."socks5-http-client"."0.1.6"; - by-version."socks5-http-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-http-client-0.1.6"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz"; - name = "socks5-http-client-0.1.6.tgz"; - sha1 = "a915ba75573787876e5d3756ee4a81d60cd4b69b"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-http-client" or []); - deps = [ - self.by-version."socks5-client"."0.3.6" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-http-client" ]; + by-version."socks5-http-client"."0.1.6" = self.buildNodePackage { + name = "socks5-http-client-0.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz"; + name = "socks5-http-client-0.1.6.tgz"; + sha1 = "a915ba75573787876e5d3756ee4a81d60cd4b69b"; + }; + deps = { + "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6"; + }; + peerDependencies = []; }; "socks5-http-client" = self.by-version."socks5-http-client"."0.1.6"; by-spec."socks5-https-client"."^0.2.2" = self.by-version."socks5-https-client"."0.2.2"; - by-version."socks5-https-client"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-socks5-https-client-0.2.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz"; - name = "socks5-https-client-0.2.2.tgz"; - sha1 = "b855e950e97c4fa6bca72a108f00278d33ac91d1"; - }) - ]; - buildInputs = - (self.nativeDeps."socks5-https-client" or []); - deps = [ - self.by-version."socks5-client"."0.3.6" - self.by-version."starttls"."0.2.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "socks5-https-client" ]; + by-version."socks5-https-client"."0.2.2" = self.buildNodePackage { + name = "socks5-https-client-0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz"; + name = "socks5-https-client-0.2.2.tgz"; + sha1 = "b855e950e97c4fa6bca72a108f00278d33ac91d1"; + }; + deps = { + "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6"; + "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; + }; + peerDependencies = []; }; "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2"; + by-spec."spotty"."^1.0.0" = + self.by-version."spotty"."1.0.0"; + by-version."spotty"."1.0.0" = self.buildNodePackage { + name = "spotty-1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spotty/-/spotty-1.0.0.tgz"; + name = "spotty-1.0.0.tgz"; + sha1 = "05bb5152b3dd0744a341764db5fcf8e47943e678"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + }; + peerDependencies = []; + }; + "spotty" = self.by-version."spotty"."1.0.0"; by-spec."sprintf"."0.1.x" = - self.by-version."sprintf"."0.1.4"; - by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sprintf-0.1.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; - name = "sprintf-0.1.4.tgz"; - sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; - }) - ]; - buildInputs = - (self.nativeDeps."sprintf" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "sprintf" ]; + self.by-version."sprintf"."0.1.5"; + by-version."sprintf"."0.1.5" = self.buildNodePackage { + name = "sprintf-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + name = "sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."stack-trace"."0.0.x" = self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "node-stack-trace-0.0.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }) - ]; - buildInputs = - (self.nativeDeps."stack-trace" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "stack-trace" ]; + by-version."stack-trace"."0.0.9" = self.buildNodePackage { + name = "stack-trace-0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."starttls"."0.x" = self.by-version."starttls"."0.2.1"; - by-version."starttls"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-starttls-0.2.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; - name = "starttls-0.2.1.tgz"; - sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; - }) - ]; - buildInputs = - (self.nativeDeps."starttls" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "starttls" ]; + by-version."starttls"."0.2.1" = self.buildNodePackage { + name = "starttls-0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; + name = "starttls-0.2.1.tgz"; + sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."string_decoder"."~0.10.x" = self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage { - name = "node-string_decoder-0.10.31"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }) - ]; - buildInputs = - (self.nativeDeps."string_decoder" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "string_decoder" ]; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."tablify"."0.1.5" = self.by-version."tablify"."0.1.5"; - by-version."tablify"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "node-tablify-0.1.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz"; - name = "tablify-0.1.5.tgz"; - sha1 = "47160ce2918be291d63cecceddb5254dd72982c7"; - }) - ]; - buildInputs = - (self.nativeDeps."tablify" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tablify" ]; + by-version."tablify"."0.1.5" = self.buildNodePackage { + name = "tablify-0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz"; + name = "tablify-0.1.5.tgz"; + sha1 = "47160ce2918be291d63cecceddb5254dd72982c7"; + }; + deps = { + }; + peerDependencies = []; }; "tablify" = self.by-version."tablify"."0.1.5"; by-spec."tablify".">=0.1.5" = self.by-version."tablify"."0.1.5"; by-spec."timeago"."0.1.0" = self.by-version."timeago"."0.1.0"; - by-version."timeago"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-timeago-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz"; - name = "timeago-0.1.0.tgz"; - sha1 = "21176a84d469be35ee431c5c48c0b6aba1f72464"; - }) - ]; - buildInputs = - (self.nativeDeps."timeago" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "timeago" ]; + by-version."timeago"."0.1.0" = self.buildNodePackage { + name = "timeago-0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz"; + name = "timeago-0.1.0.tgz"; + sha1 = "21176a84d469be35ee431c5c48c0b6aba1f72464"; + }; + deps = { + }; + peerDependencies = []; }; "timeago" = self.by-version."timeago"."0.1.0"; by-spec."tough-cookie"."~0.9.15" = self.by-version."tough-cookie"."0.9.15"; - by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "node-tough-cookie-0.9.15"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; - name = "tough-cookie-0.9.15.tgz"; - sha1 = "75617ac347e3659052b0350131885829677399f6"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = [ - self.by-version."punycode"."1.3.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; + by-version."tough-cookie"."0.9.15" = self.buildNodePackage { + name = "tough-cookie-0.9.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + name = "tough-cookie-0.9.15.tgz"; + sha1 = "75617ac347e3659052b0350131885829677399f6"; + }; + deps = { + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + }; + peerDependencies = []; }; by-spec."triplesec".">=3.0.16" = self.by-version."triplesec"."3.0.19"; - by-version."triplesec"."3.0.19" = lib.makeOverridable self.buildNodePackage { - name = "node-triplesec-3.0.19"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz"; - name = "triplesec-3.0.19.tgz"; - sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9"; - }) - ]; - buildInputs = - (self.nativeDeps."triplesec" or []); - deps = [ - self.by-version."iced-error"."0.0.9" - self.by-version."iced-lock"."1.0.1" - self.by-version."iced-runtime"."1.0.1" - self.by-version."more-entropy"."0.0.7" - self.by-version."progress"."1.1.8" - ]; - peerDependencies = [ - ]; - passthru.names = [ "triplesec" ]; + by-version."triplesec"."3.0.19" = self.buildNodePackage { + name = "triplesec-3.0.19"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz"; + name = "triplesec-3.0.19.tgz"; + sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9"; + }; + deps = { + "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9"; + "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1"; + "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2"; + "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7"; + "progress-1.1.8" = self.by-version."progress"."1.1.8"; + }; + peerDependencies = []; }; "triplesec" = self.by-version."triplesec"."3.0.19"; by-spec."triplesec".">=3.0.19" = self.by-version."triplesec"."3.0.19"; by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.3.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - name = "tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; + by-version."tunnel-agent"."0.3.0" = self.buildNodePackage { + name = "tunnel-agent-0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."tweetnacl"."^0.12.0" = self.by-version."tweetnacl"."0.12.2"; - by-version."tweetnacl"."0.12.2" = lib.makeOverridable self.buildNodePackage { - name = "node-tweetnacl-0.12.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; - name = "tweetnacl-0.12.2.tgz"; - sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; - }) - ]; - buildInputs = - (self.nativeDeps."tweetnacl" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "tweetnacl" ]; + by-version."tweetnacl"."0.12.2" = self.buildNodePackage { + name = "tweetnacl-0.12.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; + name = "tweetnacl-0.12.2.tgz"; + sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; + }; + deps = { + }; + peerDependencies = []; }; + by-spec."tweetnacl"."^0.12.2" = + self.by-version."tweetnacl"."0.12.2"; by-spec."underscore".">= 1.0.0" = - self.by-version."underscore"."1.7.0"; - by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore-1.7.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - name = "underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; + self.by-version."underscore"."1.8.2"; + by-version."underscore"."1.8.2" = self.buildNodePackage { + name = "underscore-1.8.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz"; + name = "underscore-1.8.2.tgz"; + sha1 = "64df2eb590899de950782f3735190ba42ebf311d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."underscore"."~1.4" = self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore-1.4.4"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; + by-version."underscore"."1.4.4" = self.buildNodePackage { + name = "underscore-1.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-spec."underscore.string"."~2.3.1" = self.by-version."underscore.string"."2.3.3"; - by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-underscore.string-2.3.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; - name = "underscore.string-2.3.3.tgz"; - sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore.string" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "underscore.string" ]; + by-version."underscore.string"."2.3.3" = self.buildNodePackage { + name = "underscore.string-2.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."winston"."0.8.x" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "node-winston-0.8.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; - }) - ]; - buildInputs = - (self.nativeDeps."winston" or []); - deps = [ - self.by-version."async"."0.2.10" - self.by-version."colors"."0.6.2" - self.by-version."cycle"."1.0.3" - self.by-version."eyes"."0.1.8" - self.by-version."pkginfo"."0.3.0" - self.by-version."stack-trace"."0.0.9" - ]; - peerDependencies = [ - ]; - passthru.names = [ "winston" ]; + self.by-version."winston"."0.8.3"; + by-version."winston"."0.8.3" = self.buildNodePackage { + name = "winston-0.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + name = "winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + peerDependencies = []; }; by-spec."wordwrap"."~0.0.2" = self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-wordwrap-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; + by-version."wordwrap"."0.0.2" = self.buildNodePackage { + name = "wordwrap-0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + deps = { + }; + peerDependencies = []; }; by-spec."wrappy"."1" = self.by-version."wrappy"."1.0.1"; - by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-wrappy-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; - name = "wrappy-1.0.1.tgz"; - sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; - }) - ]; - buildInputs = - (self.nativeDeps."wrappy" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "wrappy" ]; + by-version."wrappy"."1.0.1" = self.buildNodePackage { + name = "wrappy-1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }; + deps = { + }; + peerDependencies = []; }; } From 86bd15237863a81a916a37019b592fccda7b0eeb Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 7 Mar 2015 12:03:26 +0100 Subject: [PATCH 017/174] Emacs: Fix `woman'. --- pkgs/applications/editors/emacs-24/default.nix | 12 ++---------- .../applications/editors/emacs-24/site-start.el | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/editors/emacs-24/site-start.el diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 71b98eec0e9..af5c11e69ae 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -44,16 +44,8 @@ stdenv.mkDerivation rec { "-I${cairo}/include/cairo"; postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el < Date: Sat, 7 Mar 2015 12:04:18 +0100 Subject: [PATCH 018/174] curaengine: update from 14.12.1 to 15.02.1 --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index b8779eca0dc..bbd94406635 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "1cfns71mjndy2dlmccmjx8ldd0p5v88sqg0jg6ak5c864cvgbjdr"; + sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53"; }; installPhase = '' From 77362488d7a42a06c45b093740aa1d75a143e7da Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 7 Mar 2015 12:04:22 +0100 Subject: [PATCH 019/174] cura: update from 14.12.1 to 15.02.1 --- pkgs/applications/misc/cura/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index f64593517af..a13004ecd02 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "1sybsa84qznlzcgn18p70gh1v60npwfca5yn80h35msxrnh8gbp5"; + sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6"; }; desktopItem = makeDesktopItem { From 4560b1155169750d4219cbd404a57fec9b4a5e4b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 7 Mar 2015 12:08:18 +0100 Subject: [PATCH 020/174] pngcrush: update from 1.7.82 to 1.7.83 --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 668f86b8333..f9b7ad8fe64 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.82"; + name = "pngcrush-1.7.83"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1cxg0a6x7sq0dh9ia8isgx3awwx1db96wq4n22rs31sm3niiw0fl"; + sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj"; }; configurePhase = '' From b8020184823194a1853b000ef9aeb8e4d12d733f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 5 Mar 2015 18:06:51 +0300 Subject: [PATCH 021/174] stage-1: fix hibernation (close #6675) Fixes #6617. --- nixos/modules/system/boot/stage-1-init.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index a34a1360265..5af644279e5 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -177,20 +177,24 @@ fi if test -e /sys/power/resume -a -e /sys/power/disk; then if test -n "@resumeDevice@"; then resumeDev="@resumeDevice@" + resumeInfo="$(udevadm info -q property "$resumeDev" )" else for sd in @resumeDevices@; do # Try to detect resume device. According to Ubuntu bug: # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 # When there are multiple swap devices, we can't know where will hibernate # image reside. We can check all of them for swsuspend blkid. - if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then + resumeInfo="$(udevadm info -q property "$sd" )" + if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeDev="$sd" break fi done fi - if test -n "$resumeDev"; then - readlink -f "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..." + if test -e "$resumeDev"; then + resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')" + resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')" + echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..." fi fi From 2069156d5c71cec217d47bee49a6d629a9485942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Mar 2015 14:33:38 +0100 Subject: [PATCH 022/174] nestopia: disable failing parallel builds http://hydra.nixos.org/build/19861758 --- pkgs/misc/emulators/nestopia/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index f2aa1e06ec8..fc64caf1053 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; }; - enableParallelBuilding = true; + # nondeterministic failures when creating directories + enableParallelBuilding = false; buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; From 2bc4f5c1494f83eac40c42a9bba0b4b30ac21aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 7 Mar 2015 12:49:59 +0100 Subject: [PATCH 023/174] SDL2_ttf: add version 2.0.12 --- .../development/libraries/SDL2_ttf/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/SDL2_ttf/default.nix diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix new file mode 100644 index 00000000000..d1600ee8a8f --- /dev/null +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, SDL2, freetype }: + +stdenv.mkDerivation rec { + name = "SDL2_ttf-2.0.12"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + sha256 = "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"; + }; + + buildInputs = [SDL2 freetype]; + + postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/"; + + meta = { + description = "SDL TrueType library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..083e11fcf85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7286,6 +7286,8 @@ let SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; From dfaded0b8e9f79f868448d8452b00284193091d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Mar 2015 14:43:23 +0100 Subject: [PATCH 024/174] nixos docs: fix typo --- nixos/doc/manual/configuration/config-file.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 2a58ff25941..b613c7f06cc 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -68,7 +68,7 @@ instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding option declaration), nixos-rebuild will give an error like: -The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist. +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. Likewise, values in option definitions must have a correct type. For instance, must be a Boolean From 425110dea6efedb95993f1693a39ae42e64924ed Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Mar 2015 14:50:14 +0100 Subject: [PATCH 025/174] Add package: hstr (hh) --- pkgs/applications/misc/hstr/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/hstr/default.nix diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix new file mode 100644 index 00000000000..f4d4af0e12d --- /dev/null +++ b/pkgs/applications/misc/hstr/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, readline, ncurses }: + +let + version = "1.16"; +in +stdenv.mkDerivation rec { + + name = "hstr-${version}"; + + src = fetchurl { + url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; + sha256 = "1hl3fn6kravx5gsdsr0l824vnkj5aiz0dybhd3ak932v95b5knyg"; + }; + + buildInputs = [ readline ncurses ]; + + meta = { + homepage = "https://github.com/dvorka/hstr"; + description = "Shell history suggest box - easily view, navigate, search and use your command history"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # Cannot test others + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..59b7508c837 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5905,6 +5905,8 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; + hstr = callPackage ../applications/misc/hstr { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; From 08e41f7a5805593f82d73fe9390c4c0aebf54e6f Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 7 Mar 2015 09:40:46 +0900 Subject: [PATCH 026/174] firefox-bin: update to version 36.0.1 (close #6691) --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 16c38ed1c56..47d3a7ceda4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "36.0"; + version = "36.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "089dff0a3623feee0379832ccde522f86fdc448c"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "ac2ed6ffa8d27ecd978950220288e14c500aefbe"; } - { locale = "af"; arch = "linux-i686"; sha1 = "e8d44633f01dffe46e8b1278ddb274eefee556a4"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "f7d364cf00f0058e55e193cc907fd4996f96043b"; } - { locale = "an"; arch = "linux-i686"; sha1 = "85c2b67d8d963d9421559807b8dfb36baa976029"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "182b4feeb5c24921c4074ee560e1d2619bc28a25"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "a18be34551fa3352a30cc927746806ea3d0401ed"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "be45f1db3b2f6128a35313aac0738eb6f3ed53f2"; } - { locale = "as"; arch = "linux-i686"; sha1 = "44e5cf86e6318d2c25fa4f9dd9c0bfaf273f6749"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "da9d1e7e3e8ed4dbc935ece517e55ae456930e52"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "c23f59e3452f7393554491a930626495e9855855"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "fd2f6ce7d12a7c53fe9d9c11336b88c405859206"; } - { locale = "az"; arch = "linux-i686"; sha1 = "5b92332c155a95b8638506ac1c3dd78e19e277e4"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5d148d13421bacb3d430e317a41253a0999ed55f"; } - { locale = "be"; arch = "linux-i686"; sha1 = "36cfbc4b84a374535cde94643bbdacea3e141c60"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "0c0ea9dec82efd7baf2c2b382c0ab67d22f7b252"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "80e0068890e6b422f392924f4e317c6d2058695e"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b4f3fa93b7d793560627ec4d51c138d013dd6c00"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "14f5d14a135fc929ee670078e50567b5461ece8a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "95f561f92166d9db64ba5e36edaa14d7b4f989a3"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "07b00a5d4b83d8d0e451ba08325fb44c784453f6"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "a96e0bafbf811c5bd57fb3e8164e38365386e460"; } - { locale = "br"; arch = "linux-i686"; sha1 = "ee51d5b01c4489e5802c130748ee16b0a803dcb9"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "0cff437fe8c29705ec9d800d95329309eed540f4"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "0d7aef80272ca1de27560b7fe4f8ec892d386b6d"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "b62a905e9e992e3765cf196a18d50f533e2dd69f"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "82316407a9745d4dc56d961f5f2282c702950fe2"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "69ae06e06a90a28eb66db4d0df2fdbb5397abc24"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "c55e80b3d74f6dd494fe1c327053f59bef1c626a"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "932f6a15f1445d180df01195c19677cbe63fd18f"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "abe63dfde0487c77fa9b3b9c77fcffe0f977b25b"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "89eeb72232affbd54eff30f4c9844f802c0cf243"; } - { locale = "da"; arch = "linux-i686"; sha1 = "57232745fa920525721ec6e9b3c3177862b5e096"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "2ba7156b5728f17ab1e55b27ee771722a9171cf1"; } - { locale = "de"; arch = "linux-i686"; sha1 = "17fd4dd5e4b2ea39ed20a6d890ea5927532abd38"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "58c72ef01098523392f63209057373b9e793ebb8"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "a3296dd541362c4ca3ce8734faa33512a0fff4fc"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "c5c7bf61d4923ec9937afa6d261c7f0af64e468f"; } - { locale = "el"; arch = "linux-i686"; sha1 = "be04c1f884f3f0d68fa5c421eb2c8b850bef2a44"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "33ffdffb657a379f2bdb3b39bacc60d59ae9b945"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "16e2c1cda685b132b0d9378fd5ac22b0e07da320"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "89e552187c98fccc6b2270080c530bf7edf3471f"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "42be4a279ef164a43908a0896cacec6a96b2c23e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "2a9aab1149b2bf59c2b687cb80a6fa550aa263be"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "92f42855948bd262266f6239a7f989848703a85f"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "95250cced67fb3a8eab40bc8db6d70b4efa610c9"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "6564b701a3face85aa53ab80024145b58d653ec5"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "eaa3337fbca2b182981cae1423357c537a5cc33f"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "05cebf2df8c58c03934340b9d56a1a09e0af9ffc"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d8660257e51bf94c864b27cbbfa2e3ef98ef66f8"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "827deacb3439086c263e8a3f168700e510e0158c"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b905a1b57ccacb8aec34f47126c26ce435edd2d9"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "189f5230874080d982a23725cafba889db016194"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "66f416faac68c156d0c2773a47cc2014ab51b0d1"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "1bd21f64057f4ad4e74a2f6ef7c054f0662f95bb"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0bdedcd03eae8fbde6fec2f35a7c1c0d2140f0ff"; } - { locale = "et"; arch = "linux-i686"; sha1 = "d4a96b30b8f084a6b2d8e58db8e7398db0738606"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "30de382a9941c4f8857938c37e491ec1a2ebfc27"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "f43ef29288e5129b8335601ea2f45ee9b94c1b82"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "cfd741f43b86a1f0a62df2c44898289cd86c2936"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "02f264a1e2c6dff8d1c1dc70f9af305fa9156c01"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "290d8a53538fe75d1e1d36407c7efa5f56569787"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "bcfd312781f308de7550a8f12609230c48c353b2"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "eddd9175de24bc429c04be01e4af6af6f7003065"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "3cf088f03c3003f1888645b06311e7f46007df83"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "a01a6fd604471cbd69c5046ec5e13f01ca63457a"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "e8e3caf2ceef2ae8a645806731bf99572244fb24"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "753a4bab9ce3016e773d4afa7ad9d14f7746cf4e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "d0b3719b07b2c3fbe9c05ba30012331641c09d2b"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "9e8ccf90e0687aa112d48f0faeffdee58f41ea95"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a3fbc0aaf36e444ea10c4b0593ad3ec07e100147"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ed1e7b3c62dbb97bfef8b6512b8032b7bd8d2c9e"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "49fc536511bdaa096086408385ae70cace64fb0b"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "67de65f4ae8accda417cd8fc9082160a4a46cc06"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "dd239f26f4d758294ce21dc1ffebe9e02584e05d"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b9d06b047de0c66485f2c7b642b6edddd7dacc3"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a191408d96e73da4ecda1faa2510dec307a3442b"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "5bf621a4fe1a625b70df63b53930a3a5ee922405"; } - { locale = "he"; arch = "linux-i686"; sha1 = "95b84a18316a74e8fcd7d16fd6e9c1fea6778510"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "548545c4d46c296aa9d922ee5a14312a9677822c"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5a5e53167fe9050bc9482d61d17f6808cc655407"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "36e3df183cf2b5b645cb2d89b90b640b7f3697f2"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "fa1a4482857b788c49d04f6a5c3eeada25c2ac52"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "e641cf2b562c6b391e24601d4f3ceefb7117d02a"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "b1fc4cad22c66824297aec7c82053d1f7611f108"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1c2db6cf0a14002ad4c473ab1ff1fcd7f4543ca4"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "4c5a90ed0cb4d6930a3eab0a2ec216805d680895"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "c71c7e68c493bd9ecb407f32c8896b41ecfe95d5"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "01536fa2739a9dd68e713f4e4e41dac5f2b58422"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b19d7fab445ed314ca8076d0b837c0e15407649d"; } - { locale = "id"; arch = "linux-i686"; sha1 = "163e7a14d274a10780a18201afa7dfae27bf5967"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "d1108b006c607f470543915d8956394a1b767c27"; } - { locale = "is"; arch = "linux-i686"; sha1 = "5460b7445462f786f138a755615f3970fbdc7274"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "e5ec0cff0f1c88f0b2a4444ef9d71bbeb3541772"; } - { locale = "it"; arch = "linux-i686"; sha1 = "39cab2de100e4a1a2783659cab5c7247e230aa11"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "b21a1d214bddd8f074d0d0a06d64c4aa35580c68"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "b78dd34339c68348de753c66d6e12a78748aa261"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e4a1720278debf305c3f353bbafe35384b72bd61"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "371dc2118f8917d2fb904d07e23214728db13118"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4a4742b0f2efbb2491b501147bb1115f64b081d"; } - { locale = "km"; arch = "linux-i686"; sha1 = "4ad8c7a8821043a635e78f41f6da4ab6ffb334c2"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "0f4685c194054dccaac5aec9fd27f6c74ed82148"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "427b395693c8ce5d1f970f2c3a47d097785dcdea"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "15e28abebde39ebafe916523b658463087be73db"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "919862720789c005e1773b4da3427fa56c3d0528"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "aa38b625f9bab73669919c0ad36221f7c887186e"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "abc21985aa1de2fa256283f03fd3b98e147ccd3a"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "8b811ce3fe2528d33a0f00a7c3292b9cb37eb1b1"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "601dd265370ee7514a2cdf6739bfbd3d59d450d6"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "c13736cb853a35f1b6583d89b9ded90302acb637"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "09910ed1364063efc07e24a78224d1fc93b2196b"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "0a6132a1080e084c9e4a691bce7e12459cec817b"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "262c75582645c2ee1c92552263aab7fe35483bc3"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "d76755153a0656c2fd17db53c40f493a0f0dcab6"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "787ec5a7ccf9b9bd116917de752e9b411e37fe5f"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "2de12f1514a47f8c0ee8a166c7c6d68d8c966824"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "807bea1339fa44c2f1d9af264539d1f550235e62"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "aeca07821afbfc0ec1763fd30da7098e27f11b19"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "d431e48ecec721b996ab6f63b99ada14ac8bbbe5"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "fb60740faf4aa2d98821c77b28be29f456707d37"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "5ef013dd820a0c945cea2f131573ffbac5693391"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "c6d211c224711eb33b8ce55605e140cc09492bd1"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6678b16af728fe90c7b58d9e5e0a3aa01ca40ca1"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "2c77fe81d3723a9be4926bbfcfb904edc928649a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "45ee40efa93fc973e8c8d5f70f5155132f5a073b"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "29f74d404f90711974187120f8589c18125dba1e"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "162d5e2270488d40a60cb3c1e07aded76a82ba1d"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "40af304764aa36609e3969bde13ace2745bf43d8"; } - { locale = "or"; arch = "linux-i686"; sha1 = "721e06a231398af851bbaef046b69349b9c42e9f"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "925cb0a0bf1544b4a95abd3bf1e6bf14017b7c89"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "37f8b5ac56fcbda135b2ec5fd9ca7bfdb70d496e"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fabd53bf219b5c4e8b7f70e7ce82ab85609fcc01"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "773977cbd1146de1699b7c25b7a382bec8d0f55c"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b3e5db98279b7425e5a1027bdfbddf8b2ba316ae"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "fea58817e88b9e1709f1661a6465ff60e4463793"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "4e05bcc1f9dc58b6fa02aaafbfab67d185d12521"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1fd067546d5d203ef201691205244ce7bd0dd96c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "b53ae8e66d220c5a66cbd32c8762eb6a13634297"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "edc6d8dc42d7d7ee6ea6e781bcfb346ae8d7f006"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "12fd2cb3ac781490c433003b743055a67348ef04"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "87b92ed3e53f7fbed86ff1e4c6143de3c52b2f87"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "be0daa8a275ca40a8be609d24290a35a74b3ee36"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "827b057a99f1c56f4a66f1f9e8e5de2a45f68471"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "3f390efc29e49aae39d0030880a3b26cf8cd6318"; } - { locale = "si"; arch = "linux-i686"; sha1 = "7094d0d07dceae2e5a164d585e04799fd9a86a8b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "7a852dc124c1f207610aaf884119ae8804caaa41"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "2439f765924307b9d2d00ce32c13384839e39d5c"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "6017d51322d4d838449d6edf969803c1281e9229"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "cfb6d7bdfd5abf6815381997d8f19710711017b9"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "e7cf289bd59a6499f018d403a5ad661fd117073b"; } - { locale = "son"; arch = "linux-i686"; sha1 = "e49233842e845f67d090b84caa86d9209bc5e79e"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "dfaaa438d97fa3e0839b75144ba921898114f593"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "d80a35017d041e2e4bd3a8f0925bb11d696b2ad7"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1f940683602b808962317e0da9adc82d2e81c03"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "2a82cd867d939131b1985dcfeaf0d9d2a8682edf"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "ce4e49019bf1065610b862aaaec900d509561a5c"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c3a9e5d86fe94ff9f22a3f891b604379ab1374ea"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cc397d3ce95ccb4c957f05f90ac6eec28cbc383e"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "9ed781079e459942141597671a7ba13eef65bdf1"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "fbd5dc0126e6df1ebebcc270f58d16344a46ee49"; } - { locale = "te"; arch = "linux-i686"; sha1 = "7c29cc8335b9d4d3d9210c77caac74d25d477cdc"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "be02910dd1abc92d3754332e56274cc977773f64"; } - { locale = "th"; arch = "linux-i686"; sha1 = "259edc8e888fdc32c714a45cf9599d15111f14e3"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "934b28f0936b8ac9a395c906f9ca04150c9f79db"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "be173ce377a1a3ece05fb708316d79a880708137"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "52a94b0a3fb58c256b66019d9b8c8f5ab420f3e6"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "fc8e6574ef667c6a2de19cb82bec4bc47b85f907"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "bace7c6ffd9f02b0d6e24046f42c64b96db1a84a"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "1df792bf6b364632a0882ac055d9fee3b537e5c2"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "f77c0bd068b1c44d20027793a826714262d38351"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "8b367c6fee817dbb12e4c54b35df8a6d09900f33"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "307dee3afe576025524dee35904e70351cf03432"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "b04a6593e912a40d20be3c90cca3c7cdcd893e92"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "6abfc8532600cdd20ce53923913d50b7eeb52ac8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5d57176765f3be64230f36aa292992adf4a3c48c"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "df6d9a163dddacbd58591bd9572b16c7364eda2c"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "92fa3a666d858427f2a0102d85320b567c43ee40"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b11d2d33c335bd471b6762e39c646303b3345ba4"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "c707c75b403d7e8f93fd1a362e65032a97d000a4"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "dd11e37acea4ee400b80fbdcfa98f4acbc7d73f6"; } + { locale = "af"; arch = "linux-i686"; sha1 = "f3df56046427ebee3f2510e6b0b1d5214f9e8682"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "0c064022ffe3fda103e69b03f06a50bab8a496d8"; } + { locale = "an"; arch = "linux-i686"; sha1 = "d165d0545866ce3326df5b6246e3e7817025050e"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "8ed6d2374b44037e8efe1252025303987f5a5b8c"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "ebd74e1c924e935a68e18bc1de78a8525b7a4fe0"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "a72295a576621e6305aa4bfecf444a114c2e6955"; } + { locale = "as"; arch = "linux-i686"; sha1 = "1bfea721c70265683682fa004522e1518094313f"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "42144c126408a5450b80e7e5be4aca96b2a88149"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "1bb9a1dbd4acffed0e2b31a81062b466f929a498"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "ec53f1640289f5866f9c2c136610725a5524ff1e"; } + { locale = "az"; arch = "linux-i686"; sha1 = "c1396f03ba25ca4a9acf8b6998ce94d422984c68"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "ec7368e145b3f7d5e8dc2659fd97bb1008619a42"; } + { locale = "be"; arch = "linux-i686"; sha1 = "3ecc92fdbd51bd5b2a4d4e3744a9e4b6b1bd119f"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "e8dc491a4d045a9fb3ad251a59acaffa12b8aac4"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3fab78887d35fac20483c168b05a45cd646d16ab"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "03035db9fc8f6439d29ac396ae91888dfa2e127d"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "20eb295ef81b17f5427014b1234b6bca5ba34605"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "85b1af82364dbfbd5c614f2d524f455ab45e3681"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e9745b0f3d7392a10706c8668faf598b0f9daec4"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "0f54e8f852a4af3fc8567f3b3b383e1dff3c23bd"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5ae670b00b932f1732fddde8d8c804501ddd27d3"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2569214acecc2fed7c087b27d047b82ccf42e3be"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "76fe2cc09da9f87f2178b686787cf55794ec233e"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "d2f70787cc36fceda857fad3c9552d1c4fa1b812"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "ca2f3dc2369c2c2757ef8d8e6258f0b2b192e00d"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "771d59990ef2c7199a6a1a7e4a83448df03fc665"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "4acce7f304ff6ac5b07389fbe91e97cf7599b821"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "a764135d7f7301d1f08b767f7f51a99348d5b2f0"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "731b053f99eef029580eec90730a8b2b20624f47"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "636b964015a4a2ac2e45092e726c0e64d404582c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "611b1290d147af331aa193380758cc3dfa3cafdf"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "ea7d77e511b4165c7b889113b46389d4998dd50d"; } + { locale = "de"; arch = "linux-i686"; sha1 = "ca3425c8264c4d9db53a2cbce52519912de7ecf9"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "2d9b99842a185c4063166de5926db46182b258e5"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "1ee0b0d3e599b98e5b190f8c7cd5d04a1141203a"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "24f840a1ff2d00a74c617af81584f6d2907f7b7e"; } + { locale = "el"; arch = "linux-i686"; sha1 = "5ecb3ea1cdc9211270239b6ec4a9d29bc1b68409"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "fa81057327b718264e82cf6aad2c0e756ab709dc"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "8f2d51fd2f4fc43c766fa4d8db4180f8129d1a89"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "4395202bd676e8b6ff41ca946c885f1898fac1cc"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "7f54347e1929c20c1ccbcf3fa9e07749b2fbf0d3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "3906fdb4f0fdb0e4e1f21e577099f106e90f02a5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "5dd5a1e54e72962714dc443677069cd65d5f4f85"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2d1c15b66760419f33e67450c51785567d33a1b7"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "ab2c3c65b723795c9e5335c3efda8406dd660ff5"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc35c1ddb53482cdb147a4b8ef5d18b1533f859a"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "b2e4991dff339369d07d6e1b7c9c57807010f1e6"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "08358b68d518478ab3e177dc25e44bcc22d6a10b"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "dbadd2dd873009d49015d9ba73ff8399c3c923b3"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "22d995b08052750addcb06801b5ea46757de48c8"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "705524e182679992eb6cf943ac6768b7732ae4fb"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "24f1558fe278c92abf89d046dc2ca8b947d878fb"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "69333c9937dd4430facc52f05e35059433b0c78d"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "2e28497f7e6aeacf54a4b88ce91338260d5191b0"; } + { locale = "et"; arch = "linux-i686"; sha1 = "fb262e3020715e921b9408b8e661e14e8de226b1"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "d49430fa7328566369046efb6d92da24445b00af"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "56de1040fda96ccd59b010578c91303c57bf7a53"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "04c6e7f3430da79450eb3a96238c11c997feb2fb"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "6ab145b3e85c6b001d49004b99c53fd71444646a"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "fbe27589194dae4d63c7b9f8a45f3abffba42449"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "adaed8878d757ed6b74bd334b138a1c46c438de7"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "91a9fecbcb65067c420b0338dbcbf37d4bc4ed20"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "3e31d26155648b3148f8e0340db84e5725435b58"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "17a8e273c9dbf82d4f86b81426f07af62a49ee6a"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "8fa301bb3c7f8bd713c2bfa6768b73bd02a38de4"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "ddd0bf1ce6a6fc70eb48e9bd72a52b20b78f2256"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "264d6237f00cbacbdfc3d47385c349422394cdd7"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "7f9dfde56e776f16d30df9e3fc6853f8001d9837"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c032daf124507e56be02d15df8b651c814ec105b"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "2032c9e8c23fcf3ecc1db6eccfff921f6a49d734"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "4ba7388a13dedc7ad7d1d83742d9f7f8c211aa76"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "96ff03ffc0495ae4042dd6d37cd7aa2c9748b7c2"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "43c4c6e2dcc364711f5368ad1efe223df5fda4d5"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "bbd0443d6ed8598ae78a71b834c3b4c4e2d599cc"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6ee1707123bb560fe7b1dc39165c4a4250565cc4"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "6254300eddc173e888cfb70db612ef7fa41aa2e7"; } + { locale = "he"; arch = "linux-i686"; sha1 = "de203188d6b68e8a7c24bf0bea40342535897a9b"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "598d0d0d1eb22ed7378c8aaced43ebe91f0ab305"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "809126d150b1fbd42e7bcdd14c032bfb11797f46"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "c940ec3a10d61d47a891fc538c9076af90cda65b"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "a85b937eac26926f8f69d5181d27504b06284b63"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "288262d030c80308e725de8ad39914509a538526"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "9b084622ae514854bf01c6977c31d77f5d83de59"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "249f387302c44f79eef12d336af81eab07ea6463"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "c646b79ba6c74823caad11aca9ddc2ca8051117e"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "f1436bd0c5ca9ba23eb50caef9a6cc4c5dad74d8"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "9523c995e785efda19bf0cfd08fa7399b37138b3"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2992ebd3a86bbca04e443d1f55d73a876a8b4505"; } + { locale = "id"; arch = "linux-i686"; sha1 = "0bd17d152d738ba6a57da12f333fa9d942fbd274"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "1bbed6d2d3ffc2ed91c6f4badd5243af17fe63ca"; } + { locale = "is"; arch = "linux-i686"; sha1 = "90c33bf3896565df30b104d271cf4aa1d09d67d1"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "05e1f66bc84dd2ce1b142ee64b420eae3321f172"; } + { locale = "it"; arch = "linux-i686"; sha1 = "b11e6172e8040fe0c6749a684e0073fdb5a19402"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "5c47ffa4b944c71576017c684ab8ebd78fc52d08"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "acae3c28497f4ae7937f4bd38174e5a30b009475"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3610648b5a7f1bc223fb36ca94ee4d8f25060f7"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "0d4185c11d9a4ed7f2c554fd322b6a5a0fdacf53"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "189ee9cb3c88809dc9dc4c7dbde2ccafa333a432"; } + { locale = "km"; arch = "linux-i686"; sha1 = "8e39eb920380bcb87aaf48a69ea53bbf6abba2c7"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "8770649702e38783e3e2841ce0ce66f068a4b23d"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "e0407f7df92240aa866ba981c9054760cdc07cd9"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "f4558f7edab4f85612d8280cf8ab131492854ba8"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "373b7ef465500dcc7bbe9a48e113f26bc4a6a27b"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "8c8b0fe42a644c29ebafd1aa7b82733b7c5d6bb4"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "a22f113cde99557fa8973776e19f6bf4cfff1114"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "dd7917fb9c1e8bbd1db503829c8bdf1d5a935769"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "8887a493a938d10ee63630cda8ef9b3a03f01a1e"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "8fca22b9076082e859f0dff2afe7ccb245ee0fad"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "a5e4a7c95f336ca6664fee8b16e002a44561effb"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "e69bdda0ae0b3782a10e64ed3fd85ab19c7630a2"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "1efb4b5f649f219cf66f148297b5f669fb4dc16f"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "7ad1e9472c812e71e358e67021aa0a07a0d97062"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "bb96c1a1d5f371ecbed4b9c6e3ae1d244e582f6f"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "a4d18deaa48a23f588b7d8db4973a37764e97449"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "961f1ca920469c5f95ec875fbc33a913ae2a1986"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "c662ac25845f9f83cee846a3b02f41186ed7c83e"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "7b01dc5ce1dd97f5b2c3b39783eaa06556dd03da"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "2940bacdbc3f021ad421097e94017627cf59d655"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "624edc402de71fec31b63e01a9a1f2b79b3c5db3"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "30dceab395c15909d55ede343071a1fcea21af7b"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "958f0e5ffa8911eee58883b22fbf6db18d1fe1a0"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b0bc728560beb154ca2b9bd8e5c607458afa88f2"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "77976787dfa2464cd859bb3c3245fddd6cfd5c02"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "ba47a63624bd64597dde61dfbf04c94eaada4900"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "d35fdb72fd1afee6310ab4e8a764e75804822226"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "848c8d69a53ad6841ecb38d7ea93b37a70b182d8"; } + { locale = "or"; arch = "linux-i686"; sha1 = "f7b83449922833f438acd3ee9b3bdbd1ceb8d578"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a9f255e2fdcdd8b5d95026af2dfc6b90da7eed64"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "1a1552f9ae38db0314550831711a674c50a3c9d1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "eea36a9355b0d0e3477a51d7ea8cbe46745fbbf2"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "6f7c3ea9d43bae1d9177c41a60b6e568081c33f2"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "b6b7b6ae8391ff342bcc0f3fd3b14e7189f9ea02"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d474f48517529dbeb5bc12ad57b28cc1bdd3cf28"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a8906806231ecb44c6368eb22dfa01a21c05bf89"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "4910bd75b9566ba8fb1392c69610c6db527cc87c"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "9205b1556359844144275f2a768f7ab74edc5519"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "27b825a7eae976a53579cf1fed1509cd4f817023"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "03362ade5b3b5a030611cbb03767421bae1a2fe4"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "75be442bb19172111ad2189bad0232839db53dfa"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "4879b5f99852b7bf8f36237e121c6f3f58db395c"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "2d447694af3e95669be993235eb239ff74c75aef"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "227e369a35018d43d1ae6eb1b7859d289df15362"; } + { locale = "si"; arch = "linux-i686"; sha1 = "5c8ac234d851c0860b5f79f33b07c80f710776a2"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "703b7a9557e43d196b34a498e5d08a0d582edf9b"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "5b8ac9ead4f2886b21af1512b6942fb5e1acefa1"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "ffee2ee4d0e47dfe252868f602a0d4c991cc890f"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "836295228c78541efe1a21e5b64671dd8b9ec00c"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "4109e25e578d7af567f37062a753bdfcee394092"; } + { locale = "son"; arch = "linux-i686"; sha1 = "34427023f9eeaa0c9924672fc59a58890b35635d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "12cda45700a294b72f94560e421c88dbf04ceb4b"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1d3970aaa293e06b6a430cb73ccfafaf043a2364"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "0a49d2f6fed69ef22698e1ba98b8cbb008debc84"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "ed6796f73a3e34db680414a5f7b17c4d326be884"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "f22376834d160c165534f2e8ecbdad3273f46334"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "24140ca9e8acbc64ad553a528acb057c67240c00"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "875c60949b97edf2a951f470139153eafad03c9d"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "4adc26d74d6a0ec3fc80e5979750ed19ac93e290"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "24b6a6f4a16b5a19b340949d326203e1d1cdd2cc"; } + { locale = "te"; arch = "linux-i686"; sha1 = "4584c8b93624af4f630c759178d8857103ce6fca"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "4b810afe09e317593e3fe269c5d686336cd3524f"; } + { locale = "th"; arch = "linux-i686"; sha1 = "c7b00a159fee121e5ff8f9e2248d6ae1a511647f"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "4c0e26054226ccea1093a809a272cfd12d8af2ed"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "b0844d25d0c9307675559a52e7c6a097615c403d"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "67dfc61732853e99be82054344f59768b831d6d0"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d9a640765b27e192948e8b485ef4a7005513de29"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "c619fd93d8e9650482e3e1d639310b470f1c914b"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "561a2c6d943908d4b3bcd2c80895d43b141d1a2b"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c287e06e19fb45f265d314fb5199af5c449464a0"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "469cb11ded0712ad3fe9c3cc01df74e6b566c845"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "4d9e3f2ea7ab3ee76bf7d41fc6936915b18d45db"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "f48a638f685a7754ae23626a4d2e8209d5272b9c"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "a1bbf7e645291eaa7ccece17b13461d7f239f334"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "ca839f0034807715d7bccb0f97e4ffd7dbcf8e17"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6dd09c5d50ce206931d1e1f6310fe4a55d8eddd4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1265d89ca47aa9f9f4f3a7825cef622a9ac2b18a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "2464e2c81407987ff9bb2b682b71f3b8f94aa455"; } ]; } From 341c50fdcb657af09181ea45ffe08a3e40079291 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 7 Mar 2015 15:36:02 +0100 Subject: [PATCH 027/174] Update: vdirsyncer 0.4.2 -> 0.4.3 --- pkgs/tools/misc/vdirsyncer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 7a42ec48fb6..5312445563a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.4.2"; + version = "0.4.3"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = https://github.com/untitaker/vdirsyncer/archive/0.4.2.tar.gz; - sha256 = "008181mglbrp5jsvpxr59b6w4mw26h4s4gwij152i47mfbrizsl4"; + url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz"; + sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; }; pythonPath = with pythonPackages; [ From d93b114bbecc3f139b9196e327560eef0042fac1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:03:55 +0100 Subject: [PATCH 028/174] hackage-packages.nix: re-generate from Hackage 2015-03-07T13:02:15+0100 --- .../haskell-modules/configuration-common.nix | 1 - .../haskell-modules/hackage-packages.nix | 400 +++++++++++------- 2 files changed, 258 insertions(+), 143 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a02b964b10..b88f938dc4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -537,7 +537,6 @@ self: super: { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; # Depends on QuickCheck 1.x. - ersatz = dontCheck (super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }); # https://github.com/ekmett/ersatz/issues/8 HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c893e8ccbf2..79fc56accd6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11472,18 +11472,19 @@ self: { }) {}; "Plot-ho-matic" = callPackage - ({ mkDerivation, base, Chart, Chart-cairo, containers - , data-default-class, glib, gtk, lens, linear, stm, text, time + ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers + , data-default-class, generic-accessors, glib, gtk, lens, linear + , spatial-math, stm, text, time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.4.0.4"; - sha256 = "1d6nrhk2wyyii6wwwk1mlxa46sdd6xjghyp3cn6qh1i6dwq7i604"; + version = "0.5.0.0"; + sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg"; isLibrary = true; isExecutable = true; buildDepends = [ - base Chart Chart-cairo containers data-default-class glib gtk lens - linear stm text time + base cairo Chart Chart-cairo containers data-default-class + generic-accessors glib gtk lens linear spatial-math stm text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -19875,21 +19876,21 @@ self: { }) {}; "ascii-progress" = callPackage - ({ mkDerivation, ansi-terminal, async, base, data-default, hspec - , MissingH, time + ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit + , data-default, hspec, HTTP, http-conduit, http-types, time + , transformers }: mkDerivation { pname = "ascii-progress"; - version = "0.1.0.3"; - sha256 = "1cnszfaidak1gywcivjzzraaqdbz074mc8709qnr1clpqzhkszsp"; + version = "0.2.0.0"; + sha256 = "0ky2dkjv2j2bwkg1p27237dwpshnq9h760l26nk2wzg2vym2knsp"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal async base data-default MissingH time - ]; - testDepends = [ - ansi-terminal async base data-default hspec MissingH time + ansi-terminal async base bytestring conduit data-default HTTP + http-conduit http-types time transformers ]; + testDepends = [ ansi-terminal async base data-default hspec time ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; license = stdenv.lib.licenses.gpl2; @@ -22697,8 +22698,8 @@ self: { ({ mkDerivation, base, semigroupoids, semigroups, tagged }: mkDerivation { pname = "bifunctors"; - version = "4.2"; - sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6"; + version = "4.2.1"; + sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng"; buildDepends = [ base semigroupoids semigroups tagged ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; @@ -24888,6 +24889,7 @@ self: { base bliplib bytestring containers filepath language-python mtl old-time parseargs pretty ]; + jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Python to bytecode compiler"; license = stdenv.lib.licenses.bsd3; @@ -25556,8 +25558,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.1.0"; - sha256 = "05kldfic7rmxqvq6mjy0q8gi5scpg9644rhni8jw9zrsh7j1f0n3"; + version = "0.2.2.2"; + sha256 = "1mqia6rjnz5as8qv780yhxn7iyw2bxh5fx2d83x7assr6vn2489w"; buildDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -25908,9 +25910,8 @@ self: { }: mkDerivation { pname = "bytes"; - version = "0.14.1.3"; - sha256 = "18pbn7qz93hwkdlbdld2mh91hki1smbcz0gsn6d816gr7whf1fhx"; - editedCabalFile = "320ebe39de8e091a9a043c59a0f7b44fdaf9b7306bbc299cc9552aa2a31093be"; + version = "0.15"; + sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; buildDepends = [ base binary bytestring cereal containers mtl text time transformers transformers-compat void @@ -29462,27 +29463,27 @@ self: { "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, executable-path, filepath - , ghc, glpk-hs, HaXml, HTTP, HUnit, json-builder, lens, MaybeT, mtl - , network, parsec, process, QuickCheck, split, string-conversions - , tasty, tasty-hunit, tasty-th, text, transformers + , ghc, HaXml, HTTP, HUnit, json-builder, lens, lens-aeson, mtl + , network, network-uri, parsec, process, QuickCheck, split + , string-conversions, tasty, tasty-hunit, tasty-th, text + , transformers }: mkDerivation { pname = "clafer"; - version = "0.3.8"; - sha256 = "1ws7mmfa3xq2vxcva55ib0d6biz9n50ri10jljv839kw8f9ilv36"; + version = "0.3.9"; + sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring cmdargs containers data-stringmap - directory executable-path filepath glpk-hs HaXml HTTP json-builder - lens MaybeT mtl network parsec process split string-conversions - text transformers + directory executable-path filepath HaXml HTTP json-builder lens + lens-aeson mtl network network-uri parsec process split + string-conversions text transformers ]; testDepends = [ - base containers directory filepath ghc HaXml HUnit lens mtl - QuickCheck tasty tasty-hunit tasty-th + base containers data-stringmap directory filepath ghc HaXml HUnit + lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; - jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -29497,8 +29498,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.3.8"; - sha256 = "1c6dhjg9g59gvcy1hzq3by9qbrab2x4nm06k0d4n2kss15zpn4xf"; + version = "0.3.9"; + sha256 = "1nbrdxq7ynwj6ms76ayl84bb9j9yjmy3qdfdd8w810php95jrkgx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29518,16 +29519,16 @@ self: { "claferwiki" = callPackage ({ mkDerivation, base, clafer, containers, directory, gitit - , MissingH, mtl, network, process, SHA, split, time, transformers - , utf8-string + , MissingH, mtl, network, network-uri, process, SHA, split, time + , transformers, utf8-string }: mkDerivation { pname = "claferwiki"; - version = "0.3.8"; - sha256 = "1qljiwzgq3cm6q9f35nd86am29crxvplbhd4y0zz4zfrq13yf0sd"; + version = "0.3.9"; + sha256 = "05fz0ps2k6g9298jk8y69wjhvfpcidkc3c9g083snylm2cl0dax3"; buildDepends = [ - base clafer containers directory gitit MissingH mtl network process - SHA split time transformers utf8-string + base clafer containers directory gitit MissingH mtl network + network-uri process SHA split time transformers utf8-string ]; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; @@ -31174,8 +31175,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.2"; - sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; + version = "4.2.3"; + sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -32057,6 +32058,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "configifier" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, containers, hspec, hspec-discover, mtl + , pretty-show, QuickCheck, regex-easy, safe, scientific + , string-conversions, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "configifier"; + version = "0.0.2"; + sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers mtl pretty-show + regex-easy safe string-conversions text unordered-containers vector + yaml + ]; + testDepends = [ + aeson aeson-pretty base case-insensitive hspec hspec-discover + pretty-show QuickCheck scientific string-conversions + unordered-containers vector + ]; + jailbreak = true; + description = "parser for config files, shell variables, command line args"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "configuration" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35794,9 +35822,9 @@ self: { }: mkDerivation { pname = "data-easy"; - version = "0.4"; - sha256 = "07cpsix22gvx23si1s4xsx4359qj5sp3gfw6a8075zzs8f10ci0y"; - buildDepends = [ base containers either safe ]; + version = "0.5"; + sha256 = "1rrq20v1nzkmak1m7x3gpcn262h26y4mcx058g8dp413gvdniypq"; + buildDepends = [ base containers safe ]; testDepends = [ base containers directory either errors haskell-src-exts hlint hspec HUnit QuickCheck safe text transformers unix @@ -41464,6 +41492,7 @@ self: { sha256 = "0ln2b4v9nb5hmivh389jaa3yp0mwc4pm2xizbc3alvjhxy2a83wx"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; + jailbreak = true; homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -43026,29 +43055,21 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, base, blaze-builder, blaze-textual - , bytestring, containers, data-default, data-reify, directory - , doctest, filepath, HUnit, lens, mtl, parsec, process, QuickCheck - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck, transformers, unordered-containers + ({ mkDerivation, array, base, bytestring, containers, data-default + , directory, doctest, filepath, lens, mtl, parsec, process + , temporary, transformers, unordered-containers }: mkDerivation { pname = "ersatz"; - version = "0.2.6.1"; - sha256 = "1hbn49ycc47f5zjf5zdgls23a8da389ma19g43bc379l8hm2xrjj"; + version = "0.3"; + sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr"; isLibrary = true; isExecutable = true; buildDepends = [ - array base blaze-builder blaze-textual bytestring containers - data-default lens mtl parsec process temporary transformers - unordered-containers + array base bytestring containers data-default lens mtl parsec + process temporary transformers unordered-containers ]; - testDepends = [ - array base containers data-reify directory doctest filepath HUnit - mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck transformers - ]; - jailbreak = true; + testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -43146,6 +43167,7 @@ self: { version = "1.1.0.0"; sha256 = "1qwbjy71zshlg8vp0qm5wya8ikgac9jpc5xr0x31i85p3yv5xl1p"; buildDepends = [ ad base distributive lens linear reflection ]; + jailbreak = true; homepage = "https://github.com/GaloisInc/estimator"; description = "State-space estimation algorithms such as Kalman Filters"; license = stdenv.lib.licenses.bsd3; @@ -43309,13 +43331,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, hlint, hspec }: + ({ mkDerivation, base, hlint, hspec, hspec-core, process + , QuickCheck, regex-posix, xml + }: mkDerivation { pname = "euler"; - version = "0.3.3"; - sha256 = "16rd09kg7wcnli8fg5m6415hxx2y50930qad7ifglkw2p6cfwxg2"; - buildDepends = [ base ]; - testDepends = [ base hlint hspec ]; + version = "0.4.0"; + sha256 = "069sh0ih88wd35ii0ll8yck41by8m2bwwy4x24cy4sbrbbikg7z9"; + buildDepends = [ base regex-posix ]; + testDepends = [ + base hlint hspec hspec-core process QuickCheck regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -45536,9 +45562,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fixed"; - version = "0.2.1"; - sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0"; - editedCabalFile = "ebdccc1365c476d64ebe64237dc19d65d2ad11e03c265a88367bdf185f4c6980"; + version = "0.2.1.1"; + sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; buildDepends = [ base ]; homepage = "http://github.com/ekmett/fixed"; description = "Signed 15.16 precision fixed point arithmetic"; @@ -46822,8 +46847,8 @@ self: { }: mkDerivation { pname = "free"; - version = "4.10.0.1"; - sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; + version = "4.11"; + sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y"; buildDepends = [ base bifunctors comonad distributive mtl prelude-extras profunctors semigroupoids semigroups template-haskell transformers @@ -48153,6 +48178,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-accessors" = callPackage + ({ mkDerivation, base, HUnit, linear, QuickCheck, spatial-math + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "generic-accessors"; + version = "0.1.0.0"; + sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5"; + buildDepends = [ base linear spatial-math ]; + testDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + ]; + description = "stringly-named getters for generic data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl , tagged, text, unordered-containers, vector @@ -48389,8 +48430,8 @@ self: { }: mkDerivation { pname = "geni-util"; - version = "0.24.1"; - sha256 = "0djfckf2k7wvnzsl7yy6f33csa82c7ps1mah6bdnw31bqijxiyjd"; + version = "0.24.1.1"; + sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -48455,8 +48496,8 @@ self: { }: mkDerivation { pname = "geniserver"; - version = "0.24.1"; - sha256 = "0r12iz8zy3vbcjphprzydvf6rw94qdk2mcl4am9agmyw2g5gqcfd"; + version = "0.24.1.1"; + sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -56115,24 +56156,25 @@ self: { , lifted-base, monad-control, mtl, QuickCheck, resourcet , scientific, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-base, unordered-containers, vector + , transformers-base, transformers-compat, unordered-containers + , vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.9"; - sha256 = "1qi7azm0j4r310dhyh2xhchw78brkagkig1wdjz9l8wazw0niqzn"; + version = "0.3.0.10"; + sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet - scientific text transformers transformers-base unordered-containers - vector + scientific text transformers transformers-base transformers-compat + unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit http-types HUnit lifted-base monad-control mtl QuickCheck resourcet scientific test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th text transformers - transformers-base unordered-containers vector + transformers-base transformers-compat unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; @@ -58294,6 +58336,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdbc-aeson" = callPackage + ({ mkDerivation, aeson, base, convertible, HDBC, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hdbc-aeson"; + version = "0.1.2.0"; + sha256 = "0rwmswa5w84clgskwxlv553g584pwldflxdbq630gjxzqshhriz7"; + buildDepends = [ + aeson base convertible HDBC scientific text unordered-containers + vector + ]; + homepage = "https://github.com/danchoi/hdbc-aeson"; + description = "Deserialize from HDBC rows to FromJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "hdbc-postgresql-hstore" = callPackage ({ mkDerivation, attoparsec, base, containers, HDBC, text }: mkDerivation { @@ -61133,14 +61192,13 @@ self: { "hlibBladeRF" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF - , process, regex-compat }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.2"; - sha256 = "0yg8j1vj9p1i2n1nyd9zq9j66k55ib1y1qz0l7v026mvdd6qx7li"; + version = "0.1.0.3"; + sha256 = "1a74yyx06lxbfyfd2knvlnn7pvhlqgxw4fqmdzy20vr1pg7wrpm3"; buildDepends = [ base bindings-DSL bytestring ]; - testDepends = [ base hlint process regex-compat ]; + testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; @@ -66588,8 +66646,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.1"; - sha256 = "1gwijlkrdb3p79za7h2m3ilcwnrxmffqn3xvmd3sfszvrj2wws6n"; + version = "0.2.3"; + sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -67981,8 +68039,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.1"; - sha256 = "1djwqmd9kd28n7w3k28ks4xwb94d1q6i4yf1kj22iwr9cyy23xc1"; + version = "9.2.0.2"; + sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27"; buildDepends = [ base bytestring hxt-charproperties parsec text ]; testDepends = [ base bytestring HUnit parsec text ]; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; @@ -69840,8 +69898,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.0.1"; - sha256 = "196cv6lidxmjhsj83maflsnxqivw6q60nrw5ib1ssl4iqqry4k02"; + version = "0.9.1"; + sha256 = "1zqck8x48lvvz1biphzv647sw1gsl6b06700d7qpmrcmci0lcyky"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69853,7 +69911,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -70061,8 +70118,8 @@ self: { ({ mkDerivation, base, parallel }: mkDerivation { pname = "integration"; - version = "0.2.0.1"; - sha256 = "1pwykd7jjy1d7inf747mpz2bh7ygakmlb90xi57dwm8h249knbmk"; + version = "0.2.1"; + sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; buildDepends = [ base parallel ]; homepage = "https://github.com/ekmett/integration"; description = "Fast robust numeric integration via tanh-sinh quadrature"; @@ -74765,16 +74822,17 @@ self: { "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf - , pretty, transformers + , pretty, transformers, utf8-string }: mkDerivation { pname = "language-python"; - version = "0.4.1"; - sha256 = "174rj38bc3q4ak08d11r476wswfgv936m5x980kar7jj8p26q163"; + version = "0.5.0"; + sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy"; buildDepends = [ - array base containers monads-tf pretty transformers + array base containers monads-tf pretty transformers utf8-string ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -74795,6 +74853,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-python-test" = callPackage + ({ mkDerivation, base, language-python }: + mkDerivation { + pname = "language-python-test"; + version = "0.5.0"; + sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base language-python ]; + homepage = "http://github.com/bjpop/language-python-test"; + description = "testing code for the language-python library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -76620,21 +76692,23 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, binary, bytestring, containers - , deepseq, directory, distributive, doctest, filepath, ghc-prim - , hashable, HUnit, lens, reflection, semigroupoids, semigroups - , simple-reflect, tagged, template-haskell, test-framework - , test-framework-hunit, transformers, unordered-containers, vector + ({ mkDerivation, adjunctions, base, binary, bytes, bytestring + , cereal, containers, deepseq, directory, distributive, doctest + , filepath, ghc-prim, hashable, HUnit, lens, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector , void }: mkDerivation { pname = "linear"; - version = "1.16.4"; - sha256 = "11ii56sxsr7c4b7n4lbwjc4kbz443zs2g5afklvvq3l685l5zp68"; + version = "1.17.1"; + sha256 = "009bp2lv2fniq0pnn19xiapc9fc9pp6qi9rcnzw1a646gmmb9si6"; buildDepends = [ - adjunctions base binary containers deepseq distributive ghc-prim - hashable lens reflection semigroupoids semigroups tagged - template-haskell transformers unordered-containers vector void + adjunctions base binary bytes cereal containers deepseq + distributive ghc-prim hashable lens reflection semigroupoids + semigroups tagged template-haskell transformers transformers-compat + unordered-containers vector void ]; testDepends = [ base binary bytestring directory doctest filepath HUnit lens @@ -78360,6 +78434,7 @@ self: { version = "0.3.1.1"; sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5"; buildDepends = [ base data-default gl linear vector ]; + jailbreak = true; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -84834,6 +84909,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.1"; + sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + buildDepends = [ base ]; + testDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -86563,12 +86655,16 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, GLUT, OpenGLRaw, spatial-math, time }: + ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw + , spatial-math, time + }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.0"; - sha256 = "0mc0sddkcqbhvawq1zfvypa8n7fhvg8z385w7m9f4awyyaza6jd0"; - buildDepends = [ base GLUT OpenGLRaw spatial-math time ]; + version = "0.7.0.2"; + sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y"; + buildDepends = [ + base binary cereal GLUT OpenGLRaw spatial-math time + ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -87519,6 +87615,7 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -89849,8 +89946,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.0.3.1"; - sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; + version = "0.0.3.2"; + sha256 = "09nscaska3jpc0kkz4fgiyini8g6pk9b5p6kw5yp5nx984f8579a"; buildDepends = [ attoparsec base base16-bytestring bytestring containers io-streams pdf-toolbox-core text @@ -89866,8 +89963,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.0.3.0"; - sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; + version = "0.0.3.2"; + sha256 = "0wz9khfymnsyjrcvj2dgav1a1sjira481gx9ks7sz23h5pj69bds"; buildDepends = [ attoparsec base bytestring containers errors io-streams scientific transformers zlib-bindings @@ -89878,17 +89975,18 @@ self: { }) {}; "pdf-toolbox-document" = callPackage - ({ mkDerivation, base, bytestring, cipher-rc4, containers - , cryptohash, io-streams, pdf-toolbox-content, pdf-toolbox-core - , text, transformers + ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 + , containers, crypto-api, cryptohash, io-streams + , pdf-toolbox-content, pdf-toolbox-core, text, transformers }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.0.4.0"; - sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; + version = "0.0.5.0"; + sha256 = "0ilgbwmv2qvzbji79ybam5f2aghlqhq1jgchq39xxwrs2i40vrxz"; buildDepends = [ - base bytestring cipher-rc4 containers cryptohash io-streams - pdf-toolbox-content pdf-toolbox-core text transformers + base bytestring cipher-aes cipher-rc4 containers crypto-api + cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text + transformers ]; homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; @@ -89902,8 +90000,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-viewer"; - version = "0.0.3.0"; - sha256 = "173hc11aiy6zzsz624samxif953nl5gyjlxk8zy0c7a0yaxha1pp"; + version = "0.0.3.2"; + sha256 = "14245lv0jfmvmsldrhnp9n0fk7x2wjzsamwqjphbcxw70h9hw9s8"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -90639,8 +90737,8 @@ self: { }: mkDerivation { pname = "persona-idp"; - version = "0.1.0.1"; - sha256 = "138s5a565yaj2mq6gn8sh9iivwflgl9sxh6jxsf66a0hnr43mz6k"; + version = "0.1.0.2"; + sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -90648,7 +90746,6 @@ self: { directory filepath hamlet http-types jose lens optparse-applicative pem persona scotty shakespeare text time transformers unix wai x509 ]; - jailbreak = true; homepage = "https://github.com/frasertweedale/hs-persona-idp"; description = "Persona (BrowserID) Identity Provider"; license = stdenv.lib.licenses.agpl3; @@ -94001,6 +94098,7 @@ self: { editedCabalFile = "49b845d840379a6920f4dde4d88ce96a4b7b98760410db0874ed9a322b113d32"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -94077,9 +94175,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "4.3.2"; - sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v"; - editedCabalFile = "be979686814ec350c42af61b496af101aee25e5be211d22caccf59ef93e6581b"; + version = "4.4"; + sha256 = "0q4ixqv4gkvxx3wsyvp0hys11h4mms90lvka1hp1ni3h739z7kyj"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -101043,8 +101140,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "4.0"; - sha256 = "0clc65rwxdgr1ps7r06cv5dqq91cfb56z9zmmw700xdmjdjq73f4"; + version = "4.1"; + sha256 = "03igvz1xmp20bx2cqsjw6f36p6i10z51kkhpj54xmmqkphb7alpw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102298,8 +102395,8 @@ self: { }: mkDerivation { pname = "semigroups"; - version = "0.16.1"; - sha256 = "0ffy7xmzbwwbkcrpdyq0yw07w9ibiwnb2y5qmg0f5p71x830f3ad"; + version = "0.16.2.2"; + sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni"; buildDepends = [ base bytestring containers deepseq hashable nats text unordered-containers @@ -105270,6 +105367,7 @@ self: { version = "0.1.0.1"; sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy"; buildDepends = [ base linear vector ]; + jailbreak = true; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several splines and polynomials"; license = stdenv.lib.licenses.bsd3; @@ -107183,12 +107281,12 @@ self: { }) {}; "spatial-math" = callPackage - ({ mkDerivation, base, cereal, doctest, ghc-prim, linear }: + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.1.1"; - sha256 = "0c5jy0kx88x48zibia8hiamy0fz2wy1gw6yv0271pdiw34b6va1c"; - buildDepends = [ base cereal ghc-prim linear ]; + version = "0.2.1.2"; + sha256 = "18b6q3dmw7xnl53ckhcsj831b98m3vx3nk9p16sjzh10zdpb0nk8"; + buildDepends = [ base binary cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; @@ -108395,6 +108493,7 @@ self: { version = "0.2.0.0"; sha256 = "10fk8kjzksym7qz9xc8pcglcn24rzi6ry03rnhxiy0mc6d6dsrb4"; buildDepends = [ base double-conversion free mtl text ]; + jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -114912,13 +115011,12 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.12.0"; - sha256 = "1khwwikdgy202b3gscnlw87da0s9mdxzmmflcqk9c9ybmn1mx2jn"; + version = "0.12.1"; + sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9"; buildDepends = [ auto-update base bytestring containers double-conversion fast-logger text transformers unix-time ]; - jailbreak = true; homepage = "https://github.com/twittner/tinylog/"; description = "Simplistic logging using fast-logger"; license = "unknown"; @@ -122272,6 +122370,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webcrank-dispatch" = callPackage + ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text + , unordered-containers + }: + mkDerivation { + pname = "webcrank-dispatch"; + version = "0.1"; + sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k"; + buildDepends = [ + base bytestring mtl path-pieces reroute text unordered-containers + ]; + homepage = "https://github.com/webcrank/webcrank-dispatch.hs"; + description = "A simple request dispatcher"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree @@ -122918,6 +123032,7 @@ self: { version = "0.2.4"; sha256 = "0xbzk4p5jazdkrlvj67xzy9vphl6rw90jp8cv4hr8p63v7ja2kfq"; buildDepends = [ base lens linear parsec parsec-numbers ]; + jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -127820,6 +127935,7 @@ self: { version = "0.1.1.1"; sha256 = "1j37ic4v4q1wwysm4gf41f5bxd8ywr4qnqpxscigm0ghbwfs7f1z"; buildDepends = [ base bytestring profunctors zlib ]; + jailbreak = true; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; From b76fc326ffe6979f22eb9b65553138d9a2f83efc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:05:10 +0100 Subject: [PATCH 029/174] haskell-persona-idp has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b88f938dc4e..02a518b1110 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -622,9 +622,6 @@ self: super: { # https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4 hlibBladeRF = dontCheck super.hlibBladeRF; - # https://github.com/frasertweedale/hs-persona-idp/issues/1 - persona-idp = markBroken super.persona-idp; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; From 8be1ddb45c7f173f4178a944d98bdb9dc078ce7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:06:28 +0100 Subject: [PATCH 030/174] haskell-yabi-muno has been fixed. --- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index d4f87fe186d..f98ca02e563 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -88,7 +88,6 @@ self: super: { xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; - yabi-muno = markBroken super.yabi-muno; yet-another-logger = markBroken super.yet-another-logger; # https://github.com/frosch03/arrowVHDL/issues/2 From b9be39614b8110cacb0385d9a6b2727d54875061 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:18:03 +0100 Subject: [PATCH 031/174] haskell-hlibBladeRF: test suite has been fixed --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02a518b1110..03331b56166 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -619,9 +619,6 @@ self: super: { webkit = markBroken super.webkit; websnap = markBroken super.websnap; - # https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4 - hlibBladeRF = dontCheck super.hlibBladeRF; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; From 654d912db5da5498b88bd5ac03cd46b781d95662 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:27:17 +0100 Subject: [PATCH 032/174] haskell-hunt-server has broken -rtsopts in its Cabal file --- 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 03331b56166..789754a17cf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -622,6 +622,9 @@ self: super: { # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; + # https://github.com/hunt-framework/hunt/issues/99 + hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server; + } // { # Not on Hackage. From 2e0144ce09ba6aec6834a6cbfab99199052715bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Mar 2015 13:31:15 +0100 Subject: [PATCH 033/174] haskell-euler fails its test suite. --- 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 789754a17cf..4492b42a6dd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -220,6 +220,7 @@ self: super: { # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; + euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1 filestore = dontCheck super.filestore; graceful = dontCheck super.graceful; hakyll = dontCheck super.hakyll; From 5a1950d985cceb63f385161def456d75d1a86886 Mon Sep 17 00:00:00 2001 From: Jesse Haber-Kucharsky Date: Sat, 7 Mar 2015 17:53:58 +0000 Subject: [PATCH 034/174] Samba: Fixed "syncPasswordsByPam". --- nixos/modules/services/network-filesystems/samba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 8c79bf663d1..d6babb8e9a5 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -27,7 +27,7 @@ let [ global ] security = ${cfg.securityType} passwd program = /var/setuid-wrappers/passwd %u - pam password change = ${toString cfg.syncPasswordsByPam} + pam password change = ${if cfg.syncPasswordsByPam then "yes" else "no"} invalid users = ${toString cfg.invalidUsers} ${cfg.extraConfig} From 96cc8da5deb0b16747a1d92a526c3ea394db864e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 7 Mar 2015 19:01:37 +0100 Subject: [PATCH 035/174] yoshimi: update from 1.3.2 to 1.3.3 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 546561e434e..5277bf6f68c 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0f4cwcmszvpga1gsfhhjcz7yb0h08v35wsv4ssmijh8gfp3mhjml"; + sha256 = "0f37xjkay3800fbx0iwjca005b1hrjbhszrzn0xg662vf8mj44nv"; }; buildInputs = [ From a88bc51cf4acc7d8b02c87d8e3e6e5d24fc5db89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 7 Mar 2015 19:02:25 +0100 Subject: [PATCH 036/174] kde4.kde_wacomtablet: update from 2.0.2 to 2.1.0 --- pkgs/applications/misc/kde-wacomtablet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index ee93f57eafc..1b71989f8b6 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0.2"; + name = "wacomtablet-2.1.0"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; - sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz"; + sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w"; }; buildInputs = [ kdelibs xf86_input_wacom ]; From 79d7605311b8a6fb2ea66b279c3f658e9374bdb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 7 Mar 2015 19:02:55 +0100 Subject: [PATCH 037/174] darktable: update from 1.6.2 to 1.6.3 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 6a598146561..8aefbb9429c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1gf5pl4fhak1aqx3dgg0491zgsl6qr6kgyl034hnk4fzwn65zvk6"; + sha256 = "13gj5z9dz1847wlbn2cqpkvr64ds8yrn5hacs5wvbqmh0z9v6aw5"; }; buildInputs = From 0e0bc3ac86f28912d12641bc2895445850b5448d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 7 Mar 2015 19:28:55 +0100 Subject: [PATCH 038/174] gevent: update Python 2.7.9 compatibility patch --- .../python-modules/gevent_sslwrap.patch | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch index 10c61478bd6..a9bb0eab5de 100644 --- a/pkgs/development/python-modules/gevent_sslwrap.patch +++ b/pkgs/development/python-modules/gevent_sslwrap.patch @@ -1,8 +1,17 @@ -Index: b/gevent/ssl.py -=================================================================== +From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001 +From: Eugene Pankov +Date: Sun, 21 Sep 2014 12:04:13 +0300 +Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477) + +--- + gevent/_ssl2.py | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/gevent/ssl.py b/gevent/ssl.py +index 21491b7..85e6a86 100644 --- a/gevent/ssl.py +++ b/gevent/ssl.py -@@ -81,15 +81,14 @@ class SSLSocket(socket): +@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None, self._sslobj = None else: # yes, create the SSL object @@ -10,19 +19,31 @@ Index: b/gevent/ssl.py - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs) -- else: ++ if hasattr(_ssl, 'sslwrap'): ++ if ciphers is None: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs) ++ else: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs, ++ ciphers) + else: - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs, - ciphers) -+ ctx = __ssl__.SSLContext(ssl_version) -+ if keyfile or certfile: -+ ctx.load_cert_chain(certfile, keyfile) -+ if ca_certs: -+ ctx.load_verify_locations(ca_certs) -+ if ciphers: -+ ctx.set_ciphers(ciphers) -+ self._sslobj = ctx._wrap_socket(self._sock, server_side=server_side) ++ self.context = __ssl__.SSLContext(ssl_version) ++ self.context.verify_mode = cert_reqs ++ if ca_certs: ++ self.context.load_verify_locations(ca_certs) ++ if certfile: ++ self.context.load_cert_chain(certfile, keyfile) ++ if ciphers: ++ self.context.set_ciphers(ciphers) ++ self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self) ++ if do_handshake_on_connect: self.do_handshake() self.keyfile = keyfile From 0fd3db4ba1d1d6d3a6108970ef96b24853593414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 7 Mar 2015 22:31:40 +0100 Subject: [PATCH 039/174] fix #6548 --- pkgs/development/python-modules/generic/wrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 857f002cace..e343536b8fa 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -16,13 +16,13 @@ wrapPythonProgramsIn() { done for i in $(find "$dir" -type f -perm +0100); do - # Rewrite "#! .../env python" to "#! /nix/store/.../python". if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q '/python\|/pypy'; then + # catch /python and /.python-wrapped + if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." From 4c985c26af29ffe91c05c60b62ad2b7a2194ac76 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sat, 7 Mar 2015 17:47:58 +0100 Subject: [PATCH 040/174] Update swt installation Permit the installation for x86_64 --- pkgs/development/libraries/java/swt/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index f64edce7b4c..795062f12d5 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -6,16 +6,24 @@ , libsoup }: -stdenv.mkDerivation { - name = "swt-3.7.2-201202080800"; +let metadata = if stdenv.system == "i686-linux" + then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } + else if stdenv.system == "x86_64-linux" + then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } + else { }; +in stdenv.mkDerivation rec { + version = "3.7.2"; + fullVersion = "${version}-201202080800"; + name = "swt-${version}"; + builder = ./builder.sh; # Alas, the Eclipse Project apparently doesn't produce source-only # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; - sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip"; + sha256 = metadata.sha256; }; buildInputs = [unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup]; From 00fb3c0b7ee3ea1082cf82ae1bf7a691f0d69874 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sat, 7 Mar 2015 17:48:54 +0100 Subject: [PATCH 041/174] Add tuxguitar derivation --- .../editors/music/tuxguitar/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/music/tuxguitar/default.nix diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix new file mode 100644 index 00000000000..81c7d2e3e1e --- /dev/null +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib }: + +let metadata = if stdenv.system == "i686-linux" + then { arch = "x86"; sha256 = "1qmb51k0538pn7gv4nsvhfv33xik4l4af0qmpllkzrikmj8wvzlb"; } + else if stdenv.system == "x86_64-linux" + then { arch = "x86_64"; sha256 = "12af47jhlrh9aq5b3d13l7cdhlndgnfpy61gz002hajbq7i00ixh"; } + else { }; +in stdenv.mkDerivation rec { + version = "1.2"; + name = "tuxguitar-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxguitar/${name}-linux-${metadata.arch}.tar.gz"; + sha256 = metadata.sha256; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + + wrapProgram $out/tuxguitar \ + --set JAVA "${jdk}/bin/java" \ + --prefix LD_LIBRARY_PATH : "${swt}/lib:${alsaLib}/lib" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar" + ''; + + meta = with stdenv.lib; { + description = "A multitrack guitar tablature editor"; + longDescription = '' + TuxGuitar is a multitrack guitar tablature editor and player written + in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. + ''; + homepage = http://www.tuxguitar.com.ar/; + license = licenses.lgpl2; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..a8ce9205c5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11693,6 +11693,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + twister = callPackage ../applications/networking/p2p/twister { }; twmn = callPackage ../applications/misc/twmn { }; From dd71d7b44b99837ec95fa69cfb0f7d5bd37e53d9 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 8 Mar 2015 11:14:02 +0100 Subject: [PATCH 042/174] tuxguitar in $out/bin/ folder Tuxguitar was installed in $out (as per default wrapper script) Thus installing tuxguitar was not in ~/.nix-profile when installed. Now tuxguitar appears in ~/.nix-profile when installed. --- .../editors/music/tuxguitar/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 81c7d2e3e1e..09d30ad4e17 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -17,13 +17,17 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out - cp -r * $out/ + mkdir -p $out/bin + cp -r lib share $out/ + cp tuxguitar $out/bin/tuxguitar + cp tuxguitar.jar $out/lib - wrapProgram $out/tuxguitar \ + ln -s $out/share $out/bin/share + + wrapProgram $out/bin/tuxguitar \ --set JAVA "${jdk}/bin/java" \ - --prefix LD_LIBRARY_PATH : "${swt}/lib:${alsaLib}/lib" \ - --prefix CLASSPATH : "${swt}/jars/swt.jar" + --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; meta = with stdenv.lib; { From 581a90bad8799b4b4cd3439953f29420ee2a7eb7 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Sun, 8 Mar 2015 10:12:20 +0000 Subject: [PATCH 043/174] Optional user and group to run the MPD --- nixos/modules/services/audio/mpd.nix | 29 ++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index b7905233759..9abfb41087b 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -15,6 +15,8 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" + user "${cfg.user}" + group "${cfg.group}" ${if cfg.network.host != "any" then "bind_to_address ${cfg.network.host}" else ""} ${if cfg.network.port != 6600 then @@ -40,8 +42,7 @@ in { musicDirectory = mkOption { default = "${cfg.dataDir}/music"; description = '' - Extra configuration added to the end of MPD's - configuration file, mpd.conf. + The directory where mpd reads music from. ''; }; @@ -62,6 +63,16 @@ in { ''; }; + user = mkOption { + default = "mpd"; + description = "User account under which MPD runs."; + }; + + group = mkOption { + default = "mpd"; + description = "Group account under which MPD runs."; + }; + network = { host = mkOption { @@ -96,7 +107,7 @@ in { description = "Music Player Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.mpd ]; - preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd ${cfg.dataDir}"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; serviceConfig = { User = "mpd"; @@ -104,16 +115,18 @@ in { }; }; - users.extraUsers.mpd = { + users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton { inherit uid; - group = "mpd"; + name = "mpd"; + group = cfg.group; extraGroups = [ "audio" ]; description = "Music Player Daemon user"; home = "${cfg.dataDir}"; - }; - - users.extraGroups.mpd.gid = gid; + }); + users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { + gid = gid; + }); }; } From 358e9af3d32dcbdd151afce958fa53cd40430d12 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Sun, 8 Mar 2015 15:09:57 +0100 Subject: [PATCH 044/174] wineUnstable: updates (close #6508) --- pkgs/misc/emulators/wine/unstable.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index db1082f7989..a7b3da80dce 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,27 +7,27 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.36"; + version = "1.7.38"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; + sha256 = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi"; - sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f"; + url = "mirror://sourceforge/wine/wine_gecko-2.36-x86.msi"; + sha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; }; gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi"; - sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7"; + url = "mirror://sourceforge/wine/wine_gecko-2.36-x86_64.msi"; + sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh"; }; mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi"; - sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr"; + url = "mirror://sourceforge/wine/wine-mono-4.5.4.msi"; + sha256 = "1wnn273f232141x9x0sahg4w499x0g2p0xphxmwm5wh1xrzyvg10"; }; in stdenv.mkDerivation rec { From 2d8f7883a91becd4f870594f81656447d48b0b81 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Sun, 8 Mar 2015 15:36:42 +0100 Subject: [PATCH 045/174] Add scrolls game (unfree). Close #6456. @vcunat added today's date as version. --- pkgs/games/scrolls/default.nix | 45 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/games/scrolls/default.nix diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix new file mode 100644 index 00000000000..171a6d6fe83 --- /dev/null +++ b/pkgs/games/scrolls/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, gcc +, mesa_glu, libX11, libXext, libXcursor, pulseaudio +}: +stdenv.mkDerivation { + name = "scrolls-2014-03-08"; + + meta = { + description = "Scrolls is a strategy collectible card game."; + homepage = "https://scrolls.com/"; + # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ + + platforms = [ "x86_64-linux" ]; + + licence = stdenv.lib.licenses.unfree; + }; + + src = fetchurl { + url = "http://download.scrolls.com/client/linux.tar.gz"; + sha256 = "0gpwb8f1wrj6dfd9ffxga07whnxdgk66bj7j9gkbxlvrx3sj8zbp"; + }; + + libPath = stdenv.lib.makeLibraryPath [ + gcc + mesa_glu + libX11 + libXext + libXcursor + pulseaudio + ]; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mkdir -p "$out/opt/Scrolls" + cp -r ../Scrolls "$out/opt/Scrolls/" + cp -r ../Scrolls_Data "$out/opt/Scrolls/" + chmod +x "$out/opt/Scrolls/Scrolls" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$libPath" "$out/opt/Scrolls/Scrolls" + + mkdir "$out/bin" + ln -s "$out/opt/Scrolls/Scrolls" "$out/bin/Scrolls" + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29380ca4fbb..f372412f4ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2546,6 +2546,8 @@ let scrot = callPackage ../tools/graphics/scrot { }; + scrolls = callPackage ../games/scrolls { }; + scrypt = callPackage ../tools/security/scrypt { }; sdcv = callPackage ../applications/misc/sdcv { }; From 3d0a6819dace56df1ad0a48c372ffc25d335e68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 8 Mar 2015 15:46:02 +0100 Subject: [PATCH 046/174] wmutils-core: add to tools/X11 (close #6585) @vcunat fixed and cleaned this a little. --- pkgs/tools/X11/wmutils-core/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/X11/wmutils-core/default.nix diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix new file mode 100644 index 00000000000..62f6e65bc21 --- /dev/null +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libxcb }: + +stdenv.mkDerivation rec { + name = "wmutils-core-${version}"; + version = "1.0"; + + src = fetchurl { + url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; + sha256 = "10vn56rbrjykcrjr06ki4qc12sri1ywrcvm89nmxlqhkxx4i239p"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Set of window manipulation tools"; + homepage = https://github.com/wmutils/core; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f372412f4ac..aea7c663816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13707,6 +13707,8 @@ let inherit (gnome2) zenity; }; + wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; x2x = callPackage ../tools/X11/x2x { }; From 9545c0b80e74fc98e91d3dec6defac0c3a93fa6b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 8 Mar 2015 18:36:37 +0300 Subject: [PATCH 047/174] xmonad: cleanup wrapper --- .../window-managers/xmonad/wrapper.nix | 22 +++++++------------ .../haskell-modules/xmonad-nix.patch | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index cddaeb5f799..cb02a214d5b 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -1,22 +1,16 @@ -{ stdenv, buildEnv, ghcWithPackages, xmessage, makeWrapper, packages }: +{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages }: let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); -drv = buildEnv { +in stdenv.mkDerivation { name = "xmonad-with-packages"; - paths = [ xmonadEnv ]; + nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - rm $out/bin - mkdir $out/bin - for i in ${xmonadEnv}/bin/*; do - ln -s $i $out/bin - done - wrapProgram $out/bin/xmonad \ - --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ + --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) +} diff --git a/pkgs/development/haskell-modules/xmonad-nix.patch b/pkgs/development/haskell-modules/xmonad-nix.patch index f0785773cc1..810d8435a34 100644 --- a/pkgs/development/haskell-modules/xmonad-nix.patch +++ b/pkgs/development/haskell-modules/xmonad-nix.patch @@ -12,7 +12,7 @@ err = base ++ ".errors" src = base ++ ".hs" lib = dir "lib" -+ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "XMONAD_GHC") ++ ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "NIX_GHC") libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib srcT <- getModTime src binT <- getModTime bin From 02fdd3840081ffa9f3178a8ddd7ce72d505d3851 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 16:29:41 +0000 Subject: [PATCH 048/174] Add grin package --- .../python-modules/grin/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/grin/default.nix diff --git a/pkgs/development/python-modules/grin/default.nix b/pkgs/development/python-modules/grin/default.nix new file mode 100644 index 00000000000..63c40e86571 --- /dev/null +++ b/pkgs/development/python-modules/grin/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "grin-1.2.1"; + namePrefix = ""; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz"; + sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz"; + }; + + buildInputs = with pythonPackages; [ nose ]; + propagatedBuildInputs = with pythonPackages; [ argparse ]; + + meta = { + homepage = https://pypi.python.org/pypi/grin; + description = "A grep program configured the way I like it."; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a16121f2e93..3cec31f4b5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4844,6 +4844,7 @@ let }; }; + grin = callPackage ../development/python-modules/grin { }; gyp = buildPythonPackage rec { rev = "1977"; From ab6a03e70628b3165d50f940af72c0d8768e5aa0 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 17:08:53 +0000 Subject: [PATCH 049/174] Place grin in Python 2.7 section; it is not Python 3.x compatible --- 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 3cec31f4b5a..bedae7b00cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4844,8 +4844,6 @@ let }; }; - grin = callPackage ../development/python-modules/grin { }; - gyp = buildPythonPackage rec { rev = "1977"; name = "gyp-r${rev}"; @@ -13047,6 +13045,8 @@ let }; }; + grin = callPackage ../development/python-modules/grin { }; + gsutil = buildPythonPackage rec { name = "gsutil-4.6"; meta = { @@ -13270,7 +13270,7 @@ let license = licenses.mit; }; }; - + html2text = buildPythonPackage rec { name = "html2text-2014.12.29"; From 32ee876647124410c16a26162f555a3f498c07fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 20:47:24 +0300 Subject: [PATCH 050/174] Update strace --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a4cd9b28607..43959c8a43c 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.9"; + name = "strace-4.10"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "0rbgznvrxzw7vfah7mwzb4j4mm9gp4hkpiyaghlivfa0qnjzwnq9"; + sha256 = "1qhfwijxvblwdvvm70f8bhzs4fpbzqmwwbkfp636brzrds30s676"; }; nativeBuildInputs = [ perl ]; From 63ae447a0fb30e0be364837ca0ceec6cfc12d252 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 8 Mar 2015 18:29:14 +0100 Subject: [PATCH 051/174] Add 'fixedWidthString' and 'fixedWidthNumber' formatting functions --- lib/strings.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/strings.nix b/lib/strings.nix index 56d990de62d..39112407c57 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -208,4 +208,15 @@ rec { # standard GNU Autoconf scripts. enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; + # Create a fixed width string with additional prefix to match required width + fixedWidthString = width: filler: str: + let + strw = lib.stringLength str; + reqWidth = width - (lib.stringLength filler); + in + assert strw <= width; + if strw == width then str else filler + fixedWidthString reqWidth filler str; + + # Format a number adding leading zeroes up to fixed width + fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); } From 579159c72b222278dbec156a1526faddbe56472f Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 8 Mar 2015 18:30:15 +0100 Subject: [PATCH 052/174] Add dispatcher configuration options to NetworkManager module --- .../services/networking/networkmanager.nix | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f72c7fb39d6..3a64d3f09e0 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -71,6 +71,13 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; + # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 + dispatcherTypesSubdirMap = { + "basic" = ""; + /*"pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/";*/ + }; + in { ###### interface @@ -118,6 +125,30 @@ in { ''; }; + dispatcherScripts = mkOption { + type = types.listOf (types.submodule { + options = { + source = mkOption { + type = types.str; + description = '' + A script source. + ''; + }; + + type = mkOption { + type = types.enum (attrNames dispatcherTypesSubdirMap); + default = "basic"; + description = '' + Dispatcher hook type. Only basic hooks are currently available. + ''; + }; + }; + }); + default = []; + description = '' + A list of scripts which will be executed in response to network events. + ''; + }; }; }; @@ -155,7 +186,11 @@ in { ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; - }; + } + ++ lib.imap (i: s: { + text = s.source; + target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; + }) cfg.dispatcherScripts; environment.systemPackages = cfg.packages ++ [ networkmanager_openvpn From f4965177b585f8f8345027e6169f8c87ebb441d5 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 20:10:40 +0000 Subject: [PATCH 053/174] Move grin definition to tools/text and call it from all-packages.nix --- .../{development/python-modules => tools/text}/grin/default.nix | 0 pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/python-modules => tools/text}/grin/default.nix (100%) diff --git a/pkgs/development/python-modules/grin/default.nix b/pkgs/tools/text/grin/default.nix similarity index 100% rename from pkgs/development/python-modules/grin/default.nix rename to pkgs/tools/text/grin/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90dfd2876e8..650d1108f01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1412,6 +1412,8 @@ let */ graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; + grin = callPackage ../tools/text/grin { }; + grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bedae7b00cd..5e8e537949a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13045,8 +13045,6 @@ let }; }; - grin = callPackage ../development/python-modules/grin { }; - gsutil = buildPythonPackage rec { name = "gsutil-4.6"; meta = { From aca88a275e71fb356828f5eb88615590201acb74 Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 20:45:32 +0000 Subject: [PATCH 054/174] Specify platform compatibility for grin --- pkgs/tools/text/grin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 63c40e86571..638a044177f 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -15,5 +15,6 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = https://pypi.python.org/pypi/grin; description = "A grep program configured the way I like it."; + platform = stdenv.lib.platforms.all; }; } From 456750c1adae59d215b5b424ad4d3e67a337ccae Mon Sep 17 00:00:00 2001 From: Simon Jagoe Date: Sun, 8 Mar 2015 20:46:23 +0000 Subject: [PATCH 055/174] Add sjagoe as maintainer of grin package --- lib/maintainers.nix | 1 + pkgs/tools/text/grin/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8db7c33d1a5..8f7eb0dbb8d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -158,6 +158,7 @@ shell = "Shell Turner "; shlevy = "Shea Levy "; simons = "Peter Simons "; + sjagoe = "Simon Jagoe "; sjmackenzie = "Stewart Mackenzie "; skeidel = "Sven Keidel "; smironov = "Sergey Mironov "; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 638a044177f..da7799900a3 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -16,5 +16,6 @@ pythonPackages.buildPythonPackage rec { homepage = https://pypi.python.org/pypi/grin; description = "A grep program configured the way I like it."; platform = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.sjagoe ]; }; } From 09e477a045849e48786cf9c193703c16e6315e30 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Mar 2015 14:55:11 -0700 Subject: [PATCH 056/174] kernel: 3.10.70 -> 3.10.71 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 7c3857c40ae..29067459ac2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.70"; + version = "3.10.71"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x7v5gy0wr6g8697slhr57zdpv0i6lwa1yrzzrxizvsgvh4y9mpz"; + sha256 = "1h6s6bp7l71k7wnm59zgm1vk5hgja7cjs85smb3dix9vwffzjbhv"; }; features.iwlwifi = true; From 4c0158521132b68d30dbc257c13bee209e077306 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Mar 2015 14:55:20 -0700 Subject: [PATCH 057/174] kernel: 3.19 -> 3.19.1 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 1706a5f05c4..c81643a28ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19"; - modDirVersion = "3.19.0"; + version = "3.19.1"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; + sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi"; }; features.iwlwifi = true; From a086f5df7069758c0e06baaf44095cb457af2a3d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Mar 2015 14:55:23 -0700 Subject: [PATCH 058/174] kernel: 3.2.67 -> 3.2.68 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 6814d3e3045..54cf9bc9324 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.67"; + version = "3.2.68"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18pfw17gpvswcs8as2a9d53cpcaj5fq6aricgzh0n34ivyqv6msg"; + sha256 = "0yz3k3qqr13r6fa2f8i83rryiawy4rrd7qk2zx6jxq6byfd31ba2"; }; # We don't provide these patches if grsecurity is enabled, because From cf9d5ceda11f4139985e42a43834d8bbde85dfe7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Mar 2015 14:55:18 -0700 Subject: [PATCH 059/174] kernel: 3.18.8 -> 3.18.9 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 0b9e5fa2e70..93ddecbf4a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.8"; + version = "3.18.9"; # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nxa0iq3v2jrjk9jy2pjcff40ragd4zxfpizi58pkcpj0gadkyww"; + sha256 = "00cm64s17d03rlzkgqs0fq91vm95csfa2xw4zhp7y0md9fd73dxi"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a7f9f16d171..bcfbeb57ac2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.18.8"; - revision = "201502271843"; + { kversion = "3.18.9"; + revision = "201503071142"; branch = "test"; - sha256 = "0kj05imdll2j4lncdwc9r6fljad6aqa4s5k5dkh26gdcncjslkch"; + sha256 = "0acrz6v827y8pdrl26wb652hmq0qglkwdgq0ffrw6k052f5lpfx2"; }; grsec_fix_path = From 6b666dca7c59b1e00ce4a8a10a8ef55de852487b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 8 Mar 2015 14:55:14 -0700 Subject: [PATCH 060/174] kernel: 3.14.34 -> 3.14.35 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 5587725d991..62886ad5628 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.34"; + version = "3.14.35"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18hdmshrmvp99zq8f8mclaq5f4517inwa8j4ysskpjaxarjjl7h4"; + sha256 = "1d15m28iyv8g5g7gpipzswi9g2qyndrjxvgsx6adp2268cxd5my8"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index bcfbeb57ac2..c2d35ce4d2e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.34"; - revision = "201502271838"; + { kversion = "3.14.35"; + revision = "201503071140"; branch = "stable"; - sha256 = "01wi0gidshipjd7f1z5m616saywwq3ghh42ncczi0bbpcmy52x7k"; + sha256 = "076kmzyrmg8g82xhaccysdgblfkdd21rfn8wvdpf6kxavg8xn855"; }; grsecurity_unstable = grsecPatch From 201222186194eb5375070f84a76d1b3a41bae962 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:20:49 +0300 Subject: [PATCH 061/174] Update qpdfview --- pkgs/applications/misc/qpdfview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index aeb128bf778..0845a379685 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version = "0.4.14beta1"; + version = "0.4.14"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0ly0xqpgmd1ccsyqs6z0i3w1g4y3ichmibd809bjy344h6fb0m3b"; + sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; }; buildInputs = [ qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript From 2d7dd6ca2cb1b52dacd13f96c2e5c1978c5b65c2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:27:56 +0300 Subject: [PATCH 062/174] update gajim --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 82d11e02fe1..fbd9954d3aa 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16"; + version = "0.16.1"; src = fetchurl { url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; - sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; + sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6"; }; patches = [ From 0394ce7627fe1cd820a6620fc18c2245f453c5c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:30:45 +0300 Subject: [PATCH 063/174] Update pari --- pkgs/applications/science/math/pari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 2bd1aa893c5..0dbab841a81 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - version = "2.7.2"; + version = "2.7.3"; name = "pari-${version}"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "1b0hzyhafpxhmiljyhnsh6c27ydsvb2599fshwq2fjfm96awjxmc"; + sha256 = "02k54m7p47r54lgxqanxvf7pdrss17n8if1qwk5wx0j1px22j0rq"; }; buildInputs = [gmp readline]; From 66b99b7d2366f4fbff7ccc697044bd6f45e62f9b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:42:36 +0300 Subject: [PATCH 064/174] Update comiz --- pkgs/applications/window-managers/compiz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b8e342fb5d1..6b9a579a08b 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.12.0"; + version="0.9.12.1"; name="${baseName}-${version}"; - hash="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; - url="https://launchpad.net/compiz/0.9.12/0.9.12.0/+download/compiz-0.9.12.0.tar.bz2"; - sha256="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; + hash="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb"; + url="https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2"; + sha256="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo From 3d4f7be9a3a4d477f7276c5fef7a1de03bf2c8fb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:43:06 +0300 Subject: [PATCH 065/174] Update ECL --- pkgs/development/compilers/ecl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index d2c26487c0f..be65061c544 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="13.5.1"; + version="15.3.7"; name="${baseName}-${version}"; - hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; - url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz"; - sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; + hash="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; + url="mirror://sourceforge/project/ecls/ecls/15.3/ecl-15.3.7.tgz"; + sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; }; buildInputs = [ libffi From 1fdc855b2f9143162b94f69865e258d14917925c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:55:17 +0300 Subject: [PATCH 066/174] Update botan unstable --- pkgs/development/libraries/botan/default.nix | 1 + pkgs/development/libraries/botan/generic.nix | 3 ++- pkgs/development/libraries/botan/unstable.nix | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 57df3e7c915..3006a5a456d 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; revision = "9"; sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8"; + extraConfigureFlags = "--with-gnump"; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 8d68009390d..b01ea401b38 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 +, extraConfigureFlags ? "" , ... }: @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index f979fb8a959..87a3e49b89b 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "10"; - sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb"; + revision = "14"; + sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb"; openssl = null; }) From db0f66a188567648497e48c0294a270703653ad2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:56:13 +0300 Subject: [PATCH 067/174] update cl-launch --- pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 085af9df3a3..ffa56aaa9a0 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1"; + version="4.1.1"; name="${baseName}-${version}"; - hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz"; - sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; + hash="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.1.tar.gz"; + sha256="1nimbv1ms7fcikx8y6dxrzdm63psf4882z5kjr6qdyarqz6gaq20"; }; buildInputs = [ ]; From 8fcc960e6e6632266ad66e0131264a257cfedc3e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:57:11 +0300 Subject: [PATCH 068/174] Update firejail --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c2d95c3d535..6e1a4ac025c 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.20"; + version="0.9.22"; name="${baseName}-${version}"; - hash="1sjahmpjd6zmn27xp5xl683xm3353rp3094sgl2brq6477ffbi6y"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.20-rc1.tar.bz2"; - sha256="1sjahmpjd6zmn27xp5xl683xm3353rp3094sgl2brq6477ffbi6y"; + hash="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.22-rc1.tar.bz2"; + sha256="1yyh1vjhpdl307bj1ri7jskq4hpq1ifcqfz55i02w9faiz9kkmc5"; }; buildInputs = [ ]; From 81eafd776174c72ad302a9f1f3ea8fd3edff77ef Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:57:34 +0300 Subject: [PATCH 069/174] update directfb --- pkgs/development/libraries/directfb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 54fb0aa4932..81c23f7e41c 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -4,9 +4,9 @@ let s = rec { - version = "1.7.6"; + version = "1.7.7"; name="directfb-${version}"; - sha256 = "1qf94vgsbcwfa00x2aqd6795n6z43x4ghclmb4sa4bl4zfn2pws4"; + sha256 = "18r7h0pwbyyk8z3pgdv77nmma8lvr1si9gl1ghxgxf1ivhwcd1dp"; url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz"; } ; in From 5c5ade16ba462bf9e7a20148dace78511a9dfa1b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:58:13 +0300 Subject: [PATCH 070/174] update sysdig --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 3765469b9ab..4f94b407420 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.96"; + version = "0.1.98"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0fw5km1ms5faa9hlhzb6nba79m59443zblv43gpzsq1pwvpg7r94"; + sha256 = "0pq27mjvdiq20zjjhvq5fkvbq4xqcyzcrh2nkhx6gdb906h1mj4l"; }; buildInputs = [ cmake zlib luajit From ab5dd299ee4964733d2d7030a2f86f2a39843cab Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:59:01 +0300 Subject: [PATCH 071/174] update getmail --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 8c9103790b9..dbd3c631c29 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - version = "4.46.0"; + version = "4.47.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "15rqmm25pq6ll8aaqh8h6pfdkpqs7y6yismb3h3w1bz8j292c8zl"; + sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb"; }; doCheck = false; From eeac4fdf0e07b11c89db5315dcc7aa75402da113 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 21:59:43 +0300 Subject: [PATCH 072/174] update zpaq --- pkgs/tools/compression/lrzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 51f61fcf239..cf65b7b1e10 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: stdenv.mkDerivation rec { - version = "0.616"; + version = "0.620"; name = "lrzip-${version}"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2"; - sha256 = "1bimlbsfzjvippbma08ifm1grcy9i7avryrkdvnvrfyqnj6mlbcq"; + sha256 = "11ilyjrpdg0k29yidbxvz9aq54zvcxd4c308fjy578jgmlw8f2sd"; }; buildInputs = [ zlib lzo bzip2 nasm perl ]; From 44b608f64e3104c5c48c9980e0931198073edc8d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 22:00:09 +0300 Subject: [PATCH 073/174] update nilfs utils --- pkgs/tools/filesystems/nilfs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 3eee59d458d..ebec72c6d0a 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.2"; + version = "2.2.3"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "1w2i5wy290y03hg72lhkrnmfhap04ki0kkv5m8q60a2frbv6ydql"; + sha256 = "17s7d2rdb6fwrfvpif573c8n0i4f21m09pzqdsc0kyy1qqdgnc1v"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; From 09e74005b0f0212dc5c86c98c378a7ea568bc32a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 22:01:06 +0300 Subject: [PATCH 074/174] update nginx unstable --- pkgs/servers/http/nginx/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e01b6ac2557..ee5b4a1cd5d 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.9"; + version = "1.7.10"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "12lg64jrdy8qc8fjdy4nr165h2nf854w295ssj3amp9hypqcgbqs"; + sha256 = "0q24rwwlw3xas0ar4jygyb6czwjzsjz11sax199z7fnfd2sc2wyz"; }; rtmp-ext = fetchFromGitHub { From 487b95f4d0fcdea6622b8d9e7819045b609b51ca Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 22:01:23 +0300 Subject: [PATCH 075/174] update zpaq --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 6812859072d..e7f0b2b9597 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="700"; + version="702"; name="${baseName}-${version}"; - hash="1scn7xly1bmx3xr17mn32mqvpvpp53niryrqm7h0xkksmc623z9c"; - url="http://mattmahoney.net/dc/zpaq700.zip"; - sha256="1scn7xly1bmx3xr17mn32mqvpvpp53niryrqm7h0xkksmc623z9c"; + hash="0ynpz9gnbnhvyz79dxzk7r1n9yz9lbz03p0wy47v14f4cihb11y7"; + url="http://mattmahoney.net/dc/zpaq702.zip"; + sha256="0ynpz9gnbnhvyz79dxzk7r1n9yz9lbz03p0wy47v14f4cihb11y7"; }; buildInputs = [ unzip From a36c91402008b1c60ff6aede1cae2df21b76c192 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 22:16:28 +0300 Subject: [PATCH 076/174] update sbcl --- pkgs/development/compilers/sbcl/1.2.5.nix | 1 - pkgs/development/compilers/sbcl/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix index 4ca477442a9..6c0fa874f3e 100644 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ b/pkgs/development/compilers/sbcl/1.2.5.nix @@ -80,6 +80,5 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; inherit version; - updateWalker = true; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 94a17c483ab..32a73b68d5e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d"; + sha256 = "0pws10ylnsxj17dagqcdv0l36k3ax5k3hkc6c91n9yxh2nziagk0"; }; buildInputs = [ which ] From 0f8e3caec5d6a1e3270b75829789dbf558f9ea7d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 22:29:15 +0300 Subject: [PATCH 077/174] Repackage from scratch and update angelscript --- .../interpreters/angelscript/default.nix | 87 +++++++------------ 1 file changed, 31 insertions(+), 56 deletions(-) diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 7ed14b632f7..4691b8be564 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -1,63 +1,38 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +{stdenv, fetchurl, unzip}: +let + s = # Generated upstream information + rec { baseName="angelscript"; - version = "2.29.2"; + version = "2.30.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "12ws4vp9iyxbgzxxdq7g9729vg1ld92f38gfznyhsknhsay4kmf5"; + sha256 = "00w7h2g6g1lkq9ahsvzyk78nbdzhn1adsrns9mrqb2fbxv2wbz5d"; }; + buildInputs = [ + unzip + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.sha256; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareBuild" "doMake" "cleanLib" "doMakeInstall" "installDocs"]; - - prepareBuild = a.fullDepEntry '' - cd angelscript/projects/gnuc - sed -i makefile -e "s@LOCAL [?]= .*@LOCAL = $out@" - mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" - export SHARED=1 - export VERSION="${version}" - '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - - cleanLib = a.fullDepEntry '' - rm ../../lib/* - '' ["minInit"]; - - installDocs = a.fullDepEntry '' - mkdir -p "$out/share/angelscript" - cp -r ../../../docs "$out/share/angelscript" - '' ["defEnsureDir" "prepareBuild"]; - - meta = { - description = "Light-weight scripting library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.zlib; - homepage="http://www.angelcode.com/angelscript/"; - downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; - inherit version; + src = fetchurl { + inherit (s) url sha256; }; -}) x - + preConfigure = '' + cd angelscript/projects/gnuc + export makeFlags="$makeFlags PREFIX=$out" + ''; + postInstall = '' + mkdir -p "$out/share/docs/angelscript" + cp -r ../../../docs/* "$out/share/docs/angelscript" + ''; + meta = { + inherit (s) version; + description = "Light-weight scripting library"; + license = stdenv.lib.licenses.zlib ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; + homepage="http://www.angelcode.com/angelscript/"; + }; +} From 04692c04e9f73fdbe8b2baf9f2a944cf928277b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Mar 2015 23:00:56 +0300 Subject: [PATCH 078/174] Update Pipelight Wine --- pkgs/tools/misc/pipelight/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 070efe69d4c..b8182cff862 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.36"; - wine_hash = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; + wine_patches_version = "1.7.38"; + wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "1nnwhd7m1wwipg72dzjhzhk9fgcf1ynknncj89ab0pabn4wmib2i"; + sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n"; }; wine_custom = From e5a13b34426df7c16227b650a783d2b6c8a7ea74 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 9 Mar 2015 01:02:50 +0300 Subject: [PATCH 079/174] Update LibreOffice to 4.4.1.2 --- pkgs/applications/office/libreoffice/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index bed60fa66e4..896ac0a71a0 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -24,8 +24,8 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; minor = "4"; - patch = "0"; - tweak = "3"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -80,14 +80,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0y94sry2cghc82628smka7qb1xqlgrgvy98bxd2fpqfkd1llcqfg"; + sha256 = "0a1p9jd9lgb1mxnj4c55yrlc7q2dsm5s9cyax6cwaya2q5m5xhnk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "05al25vcz2z6fhm8vx77wa47nyi3r0hwll6mg2aclx7yp0s5k01d"; + sha256 = "042xp6xz3gb75k332xclwfjyik63zgcw5135967nclim1sl8rgh7"; }; }; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1xqc60ckay6xpljipcbm4915qqwk81dm2fbpxwfqc2l4gv9g6s6i"; + sha256 = "0pa7gf29sgsl6kxs7j1x1zl4ycv682wrj1dg22qc0kb7aijhpm2f"; }; # Openoffice will open libcups dynamically, so we link it directly From afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 8 Mar 2015 17:28:44 -0500 Subject: [PATCH 080/174] autonix: allow one-to-many dependency resolution --- pkgs/build-support/autonix/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index 66e2700f192..02862abca49 100644 --- a/pkgs/build-support/autonix/default.nix +++ b/pkgs/build-support/autonix/default.nix @@ -146,7 +146,11 @@ let mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; }); - resolveDeps = scope: map (dep: scope."${dep}" or null); + resolveDeps = scope: + let resolveDeps_go = dep: + let res = scope."${dep}" or []; + in if isList res then res else [res]; + in concatMap resolveDeps_go; userEnvPkg = dep: mapAttrs From a1700f84002920be6b592b5216660d6c07f8e33c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 8 Mar 2015 17:37:29 -0500 Subject: [PATCH 081/174] kf57: include Qt GraphicalEffects submodule --- pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 3b899a91d4a..6d96b1b5082 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -56,8 +56,8 @@ let Qt5DBus = qt5.base; Qt5Gui = qt5.base; Qt5LinguistTools = qt5.tools; - Qt5Qml = qt5.declarative; - Qt5Quick = qt5.quickcontrols; + Qt5Qml = [qt5.declarative qt5.graphicaleffects]; + Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects]; Qt5Script = qt5.script; Qt5Svg = qt5.svg; Qt5WebkitWidgets = qt5.webkit; From e5d4624420346b78c7e95588675a4d8ed56884e5 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 5 Mar 2015 00:33:05 +0000 Subject: [PATCH 082/174] PAM/eCryptfs now able to mount ecryptfs'd home directories on login --- lib/maintainers.nix | 1 + nixos/modules/security/pam.nix | 23 +++++++++++-- .../services/x11/display-managers/gdm.nix | 23 ++++++++++--- pkgs/tools/security/ecryptfs/default.nix | 32 +++++++++++++++---- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ece8f1041f8..fef535e06d5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -131,6 +131,7 @@ notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; + obadz = "obadz "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; olcai = "Erik Timan "; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index aa8d9224e35..e81278a95d5 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -211,7 +211,9 @@ let ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} + "auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"} + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString cfg.oathAuth @@ -223,9 +225,11 @@ let auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass ''} - auth required pam_deny.so + ${optionalString (! config.security.pam.enableEcryptfs) "auth required pam_deny.so"} # Password management. + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} password requisite pam_unix.so nullok sha512 ${optionalString config.users.ldap.enable "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} @@ -245,6 +249,8 @@ let "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"} ${optionalString cfg.updateWtmp "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} ${optionalString config.users.ldap.enable "session optional ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString config.krb5.enable @@ -357,6 +363,13 @@ in ''; }; + security.pam.enableEcryptfs = mkOption { + default = false; + description = '' + Enable eCryptfs PAM module (mounting ecryptfs home directory on login). + ''; + }; + users.motd = mkOption { default = null; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; @@ -377,7 +390,11 @@ in ++ optional config.users.ldap.enable pam_ldap ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] - ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]; + ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ] + ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ]; + + security.setuidPrograms = + optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ]; environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index b3da0cda04a..a7ebafa28b3 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -95,15 +95,23 @@ in auth required pam_succeed_if.so uid >= 1000 quiet auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so - auth sufficient pam_unix.so nullok likeauth - auth required pam_deny.so + auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + + ${optionalString (! config.security.pam.enableEcryptfs) + "auth required pam_deny.so"} account sufficient pam_unix.so password requisite pam_unix.so nullok sha512 + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start @@ -115,15 +123,22 @@ in auth required pam_succeed_if.so uid >= 1000 quiet auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so - auth sufficient pam_unix.so nullok likeauth - auth required pam_deny.so + auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth + ${optionalString config.security.pam.enableEcryptfs + "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} + ${optionalString (! config.security.pam.enableEcryptfs) + "auth required pam_deny.so"} account sufficient pam_unix.so password requisite pam_unix.so nullok sha512 + ${optionalString config.security.pam.enableEcryptfs + "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_env.so envfile=${config.system.build.pamEnvironment} session required pam_unix.so + ${optionalString config.security.pam.enableEcryptfs + "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} session required pam_loginuid.so session optional ${pkgs.systemd}/lib/security/pam_systemd.so session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 13046aa0b2d..e0f27b5d732 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, perl, keyutils, nss, nspr, python, pam -, intltool, makeWrapper, coreutils, gettext, cryptsetup, lvm2, rsync, which }: +{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam +, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }: stdenv.mkDerivation { name = "ecryptfs-104"; @@ -9,16 +9,33 @@ stdenv.mkDerivation { sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a"; }; + #TODO: replace wrapperDir below with from config.security.wrapperDir; + preConfigure = '' + FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" + for file in $FILES; do + substituteInPlace "$file" \ + --replace /sbin/mount.ecryptfs_private /var/setuid-wrappers/mount.ecryptfs_private \ + --replace /sbin/umount.ecryptfs_private /var/setuid-wrappers/umount.ecryptfs_private \ + --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ + --replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \ + --replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \ + --replace /usr/bin/ecryptfs-mount-private $out/bin/ecryptfs-mount-private \ + --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \ + --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \ + --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ + --replace /bin/mount ${utillinux}/bin/mount \ + --replace /bin/umount ${utillinux}/bin/umount \ + --replace /sbin/unix_chkpwd /var/setuid-wrappers/unix_chkpwd \ + --replace /bin/bash ${bash}/bin/bash + done + ''; + buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ]; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; postInstall = '' - FILES="$(grep -r '/bin/sh' $out/bin | sed 's,:.*,,' | uniq)" + FILES="$(grep -r '/bin/sh' $out/bin -l)" for file in $FILES; do - sed -i $file -e "s,\(/sbin/u\?mount.ecryptfs\(_private\)\?\),$out\1," \ - -e "s,\(/sbin/cryptsetup\),${cryptsetup}\1," \ - -e "s,\(/sbin/dmsetup\),${lvm2}\1," \ - -e 's,/sbin/\(unix_chkpwd\),\1,' wrapProgram $file \ --prefix PATH ":" "${coreutils}/bin" \ --prefix PATH ":" "${gettext}/bin" \ @@ -32,6 +49,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; license = licenses.gpl2Plus; + maintainers = [ lib.maintainers.obadz ]; platforms = platforms.linux; }; } From fcd5d8fdc656e3e1f34b979c2d9691bb3cfee585 Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 8 Mar 2015 11:45:15 +0100 Subject: [PATCH 083/174] ecryptfs: lib.maintainers vs maintainers --- pkgs/tools/security/ecryptfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index e0f27b5d732..239ad596bbb 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; license = licenses.gpl2Plus; - maintainers = [ lib.maintainers.obadz ]; + maintainers = [ maintainers.obadz ]; platforms = platforms.linux; }; } From 2f3dd98ef16a7c9f9e8be74356f06199e06baf09 Mon Sep 17 00:00:00 2001 From: Brendan Long Date: Sun, 8 Mar 2015 18:22:52 -0500 Subject: [PATCH 084/174] syncthing: Update to 0.10.25 https://github.com/syncthing/syncthing/releases/tag/v0.10.25 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index bdc0db6db14..cc29aeafef9 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.24"; + version = "0.10.25"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "9c79f62a10c88fe5d3452f16b0f8ed9cde5a70ec82aaec1e7b99cc1fb41a3dda"; + sha256 = "fcb6fbcd37bdcf07d2960d143209b7697ee705286754ead4cc5e6bd95cd0acb8"; }; subPackages = [ "cmd/syncthing" ]; From d31202fba2afe24a9a4c7feb52c462bb6d786191 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 11:26:18 +0100 Subject: [PATCH 085/174] sshd: Enable seccomp sandboxing --- nixos/modules/services/networking/ssh/sshd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a7617d02c18..b11f996c63c 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -381,6 +381,8 @@ in UsePAM yes + UsePrivilegeSeparation sandbox + AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${concatMapStrings (port: '' Port ${toString port} From e02d926ca92a261b46e12907c4172c0665a707f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 11:26:48 +0100 Subject: [PATCH 086/174] nixUnstable: Update to 1.9pre4074_e659978 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 8e893edbafa..8a1937933c9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.9pre4045_bd91064"; + name = "nix-1.9pre4074_e659978"; src = fetchurl { - url = "http://hydra.nixos.org/build/19776695/download/4/${name}.tar.xz"; - sha256 = "3a9d5750fa7cf4958a275516d5b7f3ab0036529a07a4ee16ade89a714fd55f7a"; + url = "http://hydra.nixos.org/build/20175576/download/4/${name}.tar.xz"; + sha256 = "51cafd9428cce907a735e37e5dd46f36218351175e458d0834b306d257760204"; }; nativeBuildInputs = [ perl pkgconfig ]; From 7f90cc40b4b62e9495a77121dc96278501afd79b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 11:36:26 +0100 Subject: [PATCH 087/174] php: Update to 5.4.38 --- pkgs/development/interpreters/php/5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4c8b80c29bd..dab983a1349 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.37"; + version = "5.4.38"; name = "php-${version}"; @@ -253,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1bd8yciy13v3aw4aiw57zpf8kgxpm6rcv73grp1yj2pbbrkzcyw5"; + sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; }; meta = { From 07536bd1fe4621dd7836f5e0a084ba944ebbb840 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 Mar 2015 20:13:21 +0100 Subject: [PATCH 088/174] merlin: update from 2.1.1 to 2.1.2 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index bd568eaf84d..2d02bf054b7 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; -let version = "2.1.1"; in +let version = "2.1.2"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz"; - sha256 = "1j60jsgls6kkkh2cv4gq36q0mf27nw8pc6k94n0yvjafjmwl3kks"; + sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n"; }; buildInputs = [ ocaml findlib yojson menhir ] From cee5ce177b5dc0373166bd277be9f48152ef9b2f Mon Sep 17 00:00:00 2001 From: desiderius Date: Mon, 9 Mar 2015 12:14:17 +0100 Subject: [PATCH 089/174] python-modules: enables support for pypy in sphinxcontrib-plantuml As the issue #6548 is closed thanks to iElectric we can now use sphinxcontrib-plantuml with pypy. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fbb4ccbe07..f91ba7e9ebf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10539,9 +10539,6 @@ let sphinxcontrib_plantuml = buildPythonPackage (rec { name = "sphinxcontrib-plantuml-0.5"; - # See issue #6548 - disabled = isPyPy; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz"; md5 = "4a8840fe3475a19c2af3fa877ab9d296"; From 6ee8c746c26c709e829f34890d6fe4547cc7629b Mon Sep 17 00:00:00 2001 From: desiderius Date: Mon, 9 Mar 2015 12:22:50 +0100 Subject: [PATCH 090/174] python-modules: enables support for pypy in sphinxcontrib-httpdomain As the issue #6548 is closed thanks to iElectric we can now use sphinxcontrib-httpdomain with pypy. --- pkgs/top-level/python-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f91ba7e9ebf..c5eba265d32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10512,9 +10512,6 @@ let sphinxcontrib_httpdomain = buildPythonPackage (rec { name = "sphinxcontrib-httpdomain-1.3.0"; - # See issue #6548 - disabled = isPyPy; - # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; From ecad1023264ca5079cad04ef360ac770de1d1440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 12:29:03 +0100 Subject: [PATCH 091/174] pkgs/development/libraries/ffmpeg/generic.nix: don't insert faac into buildInputs unconditionally This is a hot-fix to mitigate https://github.com/NixOS/nixpkgs/issues/6727. --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index fda9f8080a9..35a847d9769 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -449,14 +449,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - alsaLib bzip2 celt faac faad2 fdk_aac fontconfig freetype frei0r fribidi + alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ]; + ] ++ optional faacExtlib faac; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; From 1ce75368f1a54c97c006c1abdd454aa00fdf9acf Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Fri, 6 Mar 2015 23:43:38 +0100 Subject: [PATCH 092/174] Add uhc haskell compiler --- lib/maintainers.nix | 1 + pkgs/development/compilers/uhc/default.nix | 46 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/development/compilers/uhc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 75fdb60e84b..4f858d91124 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -138,6 +138,7 @@ page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pashev = "Igor Pashev "; + phausmann = "Philipp Hausmann "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix new file mode 100644 index 00000000000..b3126c6604b --- /dev/null +++ b/pkgs/development/compilers/uhc/default.nix @@ -0,0 +1,46 @@ +{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, + shuffle, + binary, hashable, mtl, network, uhc-util, uulib +}: + +let wrappedGhc = ghcWithPackages ( self: [binary hashable mtl network uhc-util uulib] ); +in stdenv.mkDerivation rec { + version = "1.1.8.7"; + name = "uhc-${version}"; + + src = fetchgit { + url = "https://github.com/UU-ComputerScience/uhc.git"; + rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f"; + sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl"; + }; + + postUnpack = "sourceRoot=\${sourceRoot}/EHC"; + + buildInputs = [ m4 wrappedGhc clang libtool shuffle ]; + + configureFlags = [ "--with-gcc=${clang}/bin/clang" ]; + + # UHC builds packages during compilation; these are by default + # installed in the user-specific package config file. We do not + # want that, and hack the build process to use a temporary package + # configuration file instead. + preConfigure = '' + p=`pwd`/uhc-local-packages + echo '[]' > $p + sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in + sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in + sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk + sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/config.mk.in + sed -i "s|--make|--make -package-db=$p|g" src/ehc/files2.mk + sed -i "s|--make|--make -package-db=$p|g" src/gen/files.mk + ''; + + inherit clang; + + meta = with stdenv.lib; { + homepage = "http://www.cs.uu.nl/wiki/UHC"; + description = "Utrecht Haskell Compiler"; + maintainers = [ maintainers.phausmann ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777c5e3d1ea..79423f3f4d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3511,6 +3511,12 @@ let regexCompat HsSyck random; }; + uhc = callPackage ../development/compilers/uhc/default.nix ({ + stdenv = clangStdenv; + ghcWithPackages = haskellngPackages.ghcWithPackages; + inherit (haskellngPackages) shuffle binary hashable mtl network uhc-util uulib; + }); + gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { version = "4.7-2013q3-20130916"; releaseType = "update"; From 8cb3e3b864f5c7fc09d84cbb57461aef236f5864 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 14:09:43 +0100 Subject: [PATCH 093/174] httpd: Disable insecure protocols/ciphers by default This makes us resistant to FREAK and similar attacks. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6a830827fd7..2b5cba68d45 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -171,6 +171,9 @@ let SSLRandomSeed startup builtin SSLRandomSeed connect builtin + + SSLProtocol All -SSLv2 -SSLv3 + SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP ''; From 025d063d454f4ec0f54f3d40b8d6955a756691df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 10:54:07 +0100 Subject: [PATCH 094/174] hackage-packages: re-generate from Hackage 2015-03-08T10:54:07+0100 --- .../haskell-modules/hackage-packages.nix | 663 ++++++++++++------ 1 file changed, 443 insertions(+), 220 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 79fc56accd6..4eee51563d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4795,6 +4795,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GLFW-b_1_4_7_1" = callPackage + ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "GLFW-b"; + version = "1.4.7.1"; + sha256 = "1dzqvlxif5vadyd6vl9q260hhfp1rhmab9jwy3y1xmai31ddhlbb"; + buildDepends = [ base bindings-GLFW ]; + testDepends = [ + base bindings-GLFW HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + description = "Bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "GLFW-b-demo" = callPackage ({ mkDerivation, base, GLFW-b, mtl, OpenGL, pretty, stm , transformers @@ -12252,8 +12269,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.5.0.3"; - sha256 = "0yhcshc6hdkny6llxab027ndyshy9ghk5jb86jrzp9rkzd8z965j"; + version = "0.5.1"; + sha256 = "1h3sfgxkr002n4sb0rrc5562mbpwrjndkjl3ab4wfsm5zh6q3gl2"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms @@ -12581,7 +12598,7 @@ self: { description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL2; SDL2_ttf = null;}; + }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "SFML" = callPackage ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network @@ -19877,20 +19894,22 @@ self: { "ascii-progress" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit - , data-default, hspec, HTTP, http-conduit, http-types, time - , transformers + , data-default, hspec, HTTP, http-conduit, http-types, QuickCheck + , time, transformers }: mkDerivation { pname = "ascii-progress"; - version = "0.2.0.0"; - sha256 = "0ky2dkjv2j2bwkg1p27237dwpshnq9h760l26nk2wzg2vym2knsp"; + version = "0.2.1.0"; + sha256 = "0r3an905by72w7r9pd00rf7fn061v668bh4x6apllmpxid7a7pm7"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal async base bytestring conduit data-default HTTP http-conduit http-types time transformers ]; - testDepends = [ ansi-terminal async base data-default hspec time ]; + testDepends = [ + ansi-terminal async base data-default hspec QuickCheck time + ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; license = stdenv.lib.licenses.gpl2; @@ -22150,8 +22169,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.3.11"; - sha256 = "05nbaba4ww24x326dd1x1r94yv9jl9r5hys2qg5qkyzldpzqndl6"; + version = "0.3.11.1"; + sha256 = "057sq6jm8vskw9d9maqc6a85x45lslyiw3j1q7kaczl3851zaxl3"; buildDepends = [ base bytestring containers hashable lifted-base ReadArgs safe system-filepath text transformers unordered-containers vector @@ -22538,8 +22557,8 @@ self: { }: mkDerivation { pname = "bet"; - version = "0.1.2.1"; - sha256 = "1frl0a3sxracv32plx0imqpng3pn8v5z75a71mqvrinbsiyz7qbh"; + version = "0.1.2.2"; + sha256 = "1sk8sgfcywxr54g25ah978k0d1x263mzi69zbx5wk67bs4sqvmds"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -23255,6 +23274,27 @@ self: { inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs) mesa;}; + "bindings-GLFW_3_1_1" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXext + , libXfixes, libXi, libXrandr, libXxf86vm, mesa, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.1.1"; + sha256 = "17r6q72s3gfbcr1l9wlh4v0wd6r1lajaq6yqyd0r29qnz3ahpvs5"; + buildDepends = [ base bindings-DSL ]; + testDepends = [ base HUnit test-framework test-framework-hunit ]; + extraLibraries = [ + libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; + inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xlibs) libXi; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + inherit (pkgs) mesa;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -27731,16 +27771,17 @@ self: { }) {}; "casadi-bindings" = callPackage - ({ mkDerivation, base, casadi, casadi-bindings-core + ({ mkDerivation, base, binary, casadi, casadi-bindings-core , casadi-bindings-internal, cereal, containers, linear, vector + , vector-binary-instances }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.7"; - sha256 = "05xgsn9xgkckx7ip2qqy332miv6yl70avyzp7z5ww8lvn2v8q8ks"; + version = "2.2.0.8"; + sha256 = "131r3l1psacb3mps02mqc4vjdghn2w5jwz2j6khr7w6bk13qlpj0"; buildDepends = [ - base casadi-bindings-core casadi-bindings-internal cereal - containers linear vector + base binary casadi-bindings-core casadi-bindings-internal cereal + containers linear vector vector-binary-instances ]; pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -28759,16 +28800,16 @@ self: { "chaselev-deque" = callPackage ({ mkDerivation, abstract-deque, abstract-deque-tests, array - , atomic-primops, base, bits-atomic, containers, ghc-prim, HUnit - , test-framework, test-framework-hunit, transformers, vector + , atomic-primops, base, containers, ghc-prim, HUnit, test-framework + , test-framework-hunit, transformers, vector }: mkDerivation { pname = "chaselev-deque"; - version = "0.5.0.3"; - sha256 = "1qkrypqsbfnr6kcl6idqmq2z4nf6jmqmgzddzhh031nxd22p18y6"; + version = "0.5.0.5"; + sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d"; buildDepends = [ - abstract-deque array atomic-primops base bits-atomic ghc-prim - transformers vector + abstract-deque array atomic-primops base ghc-prim transformers + vector ]; testDepends = [ abstract-deque abstract-deque-tests array atomic-primops base @@ -32541,15 +32582,15 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, semigroups, transformers + ({ mkDerivation, base, foreign-var, semigroups, transformers , transformers-compat, void }: mkDerivation { pname = "contravariant"; - version = "1.2.1"; - sha256 = "1v8c3wdczp674f1h29w348vibh78m6i1kkrxbw9lvvbpi3aganb4"; + version = "1.2.2.1"; + sha256 = "0w1kgx85wbf96f1hr50b6nh9pqjbqbn4axfd419b38xy09j61j75"; buildDepends = [ - base semigroups transformers transformers-compat void + base foreign-var semigroups transformers transformers-compat void ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -33486,8 +33527,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.13.0"; - sha256 = "0194xdpv3q8gyczanhi4p819ms79n1x69n5q481ilw90i9hdh8kd"; + version = "0.13.1"; + sha256 = "18vnwncpf18076bjqajrh6n0pkr9bmpcspf7v0s31df1lm6kxhcf"; buildDepends = [ async auto-update base bytestring containers cql data-default-class exceptions hashable iproute lens monad-control mtl mwc-random @@ -38667,12 +38708,11 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.0.4"; - sha256 = "04ldrbwla8gcsan8hahjgf4mzm6wz7kxhwrikqgnyv0dm45ias7c"; + version = "0.6.0.5"; + sha256 = "1mskyz5iab8jy7b2k3nn7c3z7bvwv4cqhviw4qr5xpzqk59ls7kr"; buildDepends = [ base blaze-html blaze-markup digestive-functors text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -38763,13 +38803,12 @@ self: { }: mkDerivation { pname = "digestive-functors-snap"; - version = "0.6.1.0"; - sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr"; + version = "0.6.1.1"; + sha256 = "1y9i1hiawzhdglg1jrnxd36h534i1hxg0r8dnibafwk34v1j2n24"; buildDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -41488,11 +41527,10 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.1"; - sha256 = "0ln2b4v9nb5hmivh389jaa3yp0mwc4pm2xizbc3alvjhxy2a83wx"; + version = "0.1.0.2"; + sha256 = "1g75qzsmwpcxs18ildnvy9df8fsns5ya8dparx7fdybjlr5wv5xd"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; - jailbreak = true; homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -43331,17 +43369,15 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, hlint, hspec, hspec-core, process - , QuickCheck, regex-posix, xml + ({ mkDerivation, base, happy, hlint, hspec, process, regex-posix + , xml }: mkDerivation { pname = "euler"; - version = "0.4.0"; - sha256 = "069sh0ih88wd35ii0ll8yck41by8m2bwwy4x24cy4sbrbbikg7z9"; - buildDepends = [ base regex-posix ]; - testDepends = [ - base hlint hspec hspec-core process QuickCheck regex-posix xml - ]; + version = "0.6.0"; + sha256 = "0dqm4cq9hb7l6xa84y53v6l226f8qfw5avpbsc0zikx50jlz0q2g"; + buildDepends = [ base ]; + testDepends = [ base happy hlint hspec process regex-posix xml ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -43583,8 +43619,8 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8"; - sha256 = "010sqlqcwlqrd9kg1lvvpvbdgagwvdh8li082zh44r26blsamd74"; + version = "0.8.0.1"; + sha256 = "0qsbcmhr5ilmdw4wc3f316nsnrmhlqzrgdi15a6sv72nlk09kwsb"; buildDepends = [ base mtl stm transformers transformers-compat ]; testDepends = [ base mtl QuickCheck stm test-framework test-framework-quickcheck2 @@ -43935,12 +43971,12 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, binary, deepseq, template-haskell }: + ({ mkDerivation, base, binary, constraints, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.3"; - sha256 = "0a55ngp62z6a8awrps921zz6s2n27x4hpgsr80xphjgrfmrb9z9k"; - buildDepends = [ base binary deepseq template-haskell ]; + version = "0.3.1"; + sha256 = "09vz1z2v2jgn0lrnb8pkgr3r5xbcqmpww671q75nyi74f308zn2n"; + buildDepends = [ base binary constraints template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; license = stdenv.lib.licenses.bsd3; @@ -44233,6 +44269,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "farmhash" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck }: + mkDerivation { + pname = "farmhash"; + version = "0.1.0.1"; + sha256 = "1dm3msrlrfhm20qc1d5a42w4sspmdwgmdkm75xprmyvpyivh2alb"; + buildDepends = [ base bytestring ]; + testDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/abhinav/haskell-farmhash"; + description = "Fast hash functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring , bytestring-builder, directory, filepath, hspec, text @@ -44990,11 +45039,9 @@ self: { ({ mkDerivation, array, base, containers, mtl }: mkDerivation { pname = "fgl"; - version = "5.5.0.1"; - sha256 = "0qw70f5hfrxmrx49wx8vk2f5cam7jbpb20mp4i0ybcwdld5ncqda"; - editedCabalFile = "3f816c9f86c3320b9a1b93c2830edfc88ca7a27e58b3b7092a2292cf1fd78f65"; + version = "5.5.1.0"; + sha256 = "0rcmz0xlyr1wj490ffja29z1jgl51gz19ka609da6bx39bwx7nga"; buildDepends = [ array base containers mtl ]; - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45698,8 +45745,8 @@ self: { }: mkDerivation { pname = "fixed-vector-hetero"; - version = "0.3.0.0"; - sha256 = "1zmxwmksfzbl656c9iyz1nig19hnkfvv874a2gm5mc28yr6zwvqg"; + version = "0.3.1.0"; + sha256 = "0x5fjggm0licrdd442pr1968zlzfb0ah4ib8s9yxcb2p6vc39lzv"; buildDepends = [ base deepseq fixed-vector ghc-prim primitive transformers ]; @@ -46457,6 +46504,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foreign-var" = callPackage + ({ mkDerivation, base, stm, transformers }: + mkDerivation { + pname = "foreign-var"; + version = "0.1"; + sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd"; + buildDepends = [ base stm transformers ]; + homepage = "http://github.com/ekmett/foreign-var/"; + description = "Encapsulating mutatable state in external libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "forkable-monad" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -47127,8 +47186,8 @@ self: { }: mkDerivation { pname = "friday"; - version = "0.2.0.2"; - sha256 = "1warjzy5ciabyd3wkfaxz82y893vri3zbn8i8xhf7018fcgkna0b"; + version = "0.2.1.0"; + sha256 = "02n0cdmd4fc3vi2i73s7q4pynnn29dpa1rh94z6j5lb5arcz9i8p"; buildDepends = [ base bytestring convertible deepseq primitive ratio-int transformers vector @@ -47148,8 +47207,8 @@ self: { }: mkDerivation { pname = "friday-devil"; - version = "0.1.0.1"; - sha256 = "0431jzykspz6kqkxldnjz2v6r6kw5f7k361ic6mk9xij15300lp0"; + version = "0.1.1.1"; + sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj"; buildDepends = [ base bytestring convertible deepseq friday transformers vector ]; @@ -54346,17 +54405,17 @@ self: { }) {}; "handsy" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, free + ({ mkDerivation, base, bytestring, data-default-class, operational , process, process-extras, retry, shell-escape, split, tasty , tasty-hunit, tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.11"; - sha256 = "1zvz7zwj3ribz4b78082kwmlgp5aqcw6v1lw5klfx95rs009xw5w"; + version = "0.0.12"; + sha256 = "0awiffsgwa2vmib9yq9zamkr4zm1vw9xxj3g47d1ljq3jg93nn3f"; buildDepends = [ - base bytestring data-default-class free process process-extras - retry shell-escape split transformers + base bytestring data-default-class operational process + process-extras retry shell-escape split transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-th ]; homepage = "https://github.com/utdemir/handsy"; @@ -57679,8 +57738,8 @@ self: { ({ mkDerivation, base, haste-compiler, transformers }: mkDerivation { pname = "haste-perch"; - version = "0.1.0.7"; - sha256 = "0qikaiqk408x90p1wqz0p7jc2ri4raqnl4d50x3g5abqj2y1h93n"; + version = "0.1.0.8"; + sha256 = "0p15wzl7rina4pnldhkm188addqlgmc9k4cryv7v2dr9i0wv5y8f"; buildDepends = [ base haste-compiler transformers ]; homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; @@ -58342,8 +58401,8 @@ self: { }: mkDerivation { pname = "hdbc-aeson"; - version = "0.1.2.0"; - sha256 = "0rwmswa5w84clgskwxlv553g584pwldflxdbq630gjxzqshhriz7"; + version = "0.1.3.0"; + sha256 = "1mqcpzp9fw604nab0zs9r8515072pwbkfr4vvdpjhbdny5022naw"; buildDepends = [ aeson base convertible HDBC scientific text unordered-containers vector @@ -58682,9 +58741,8 @@ self: { ({ mkDerivation, base, directory, doctest, filepath }: mkDerivation { pname = "heaps"; - version = "0.3.1"; - sha256 = "1h0p097zc1wjinhdhy4ssav7jpicc85074d926nmnhdgz9vaajwj"; - editedCabalFile = "8e3b4bef28315c04ce0b34d8f8b4f38527765569d19c4a1802fe77186b26b55c"; + version = "0.3.2"; + sha256 = "1xkb2lk97ymgjxk89159h226qs89z5wank4jx35awwzv4f67ay46"; buildDepends = [ base ]; testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/heaps/"; @@ -60336,8 +60394,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.3.12"; - sha256 = "0qz9jpl6ha83yxh9wzqhzcxa9zc6f4f9z44srhm4jkqq07lh3api"; + version = "4.4.0"; + sha256 = "0kdy3rdjh4kjlxqfdqxnnaa9cw4avpykqv6ryvw95nxqqraqpm65"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61195,8 +61253,8 @@ self: { }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.3"; - sha256 = "1a74yyx06lxbfyfd2knvlnn7pvhlqgxw4fqmdzy20vr1pg7wrpm3"; + version = "0.1.0.4"; + sha256 = "0xs56kszgwm2hz1fl2cajzbygm8n3883bz3j7qqckw14iw81c25b"; buildDepends = [ base bindings-DSL bytestring ]; testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; @@ -61248,7 +61306,7 @@ self: { "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, hscolour, process + , directory, extra, filepath, haskell-src-exts, process , transformers, uniplate }: mkDerivation { @@ -61259,7 +61317,7 @@ self: { isExecutable = true; buildDepends = [ ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts hscolour process transformers uniplate + filepath haskell-src-exts process transformers uniplate ]; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; @@ -61931,17 +61989,20 @@ self: { }) {}; "hoe" = callPackage - ({ mkDerivation, base, cmdargs, hint, mtl }: + ({ mkDerivation, base, cmdargs, exceptions, hint, mtl, regex-posix + , split, time + }: mkDerivation { pname = "hoe"; - version = "0.2"; - sha256 = "089iwvgz50mhdch1anag66g0wqya0sm5jhp2h32dfsi0hlrp34f7"; + version = "1.0.1"; + sha256 = "06z44i4lmd44l9fjdd49lf0j4a8gmh5njiwlr77ycsyxf9mcwaa1"; isLibrary = false; isExecutable = true; - buildDepends = [ base cmdargs hint mtl ]; - jailbreak = true; + buildDepends = [ + base cmdargs exceptions hint mtl regex-posix split time + ]; homepage = "http://github.com/tanakh/hoe"; - description = "Haskell One-liner Evaluator"; + description = "hoe: Haskell One-liner Evaluator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -63131,8 +63192,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.3"; - sha256 = "11khylc73hsg8p64jz5ykdnpix7f5qv3zk2kf0n42yync290jc9w"; + version = "0.1.2.4"; + sha256 = "1ahwymwksfh40lay41wfzfr02fzgls6h2mg3ylw0i794dhpgqq92"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -64531,6 +64592,20 @@ self: { license = "GPL"; }) {}; + "hscolour_1_21" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "hscolour"; + version = "1.21"; + sha256 = "1smzr83c3fk3fwfkp973j2nz985nbj9j9ps9fpwndsxxfyqj830d"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers ]; + homepage = "http://code.haskell.org/~malcolm/hscolour/"; + description = "Colourise Haskell code"; + license = "GPL"; + }) {}; + "hscope" = callPackage ({ mkDerivation, base, bytestring, cereal, cpphs, deepseq , directory, haskell-src-exts, mtl, process, pure-cdb, test-simple @@ -66701,8 +66776,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.7.2"; - sha256 = "1y788yj3jaw4l10p31qvhpy33sn9spfrql4ydrs67mkalbad0f7a"; + version = "0.4.8"; + sha256 = "10vflra58ndyq861zswshpcnqdx9acglb2m8f2yzha0slihwda77"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -68500,9 +68575,8 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.3"; - sha256 = "1agywf7142d02m8pza84pzw908g1fjgc6799w7h93mwq63c0708m"; - editedCabalFile = "6a6ade94dda076697ee8a68b39f7197921c32794626fd56f1654e81f3b1bd6a1"; + version = "0.3.1"; + sha256 = "13pmqkqldy5n274rld9acdypp39f51qmc9v14kwpw95lkpd9bxnl"; buildDepends = [ approximate base binary bits bytes cereal cereal-vector comonad deepseq distributive generic-deriving hashable hashable-extras lens @@ -68512,7 +68586,6 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -69898,8 +69971,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.1"; - sha256 = "1zqck8x48lvvz1biphzv647sw1gsl6b06700d7qpmrcmci0lcyky"; + version = "0.9.1.1"; + sha256 = "0ijc97xj1fz8ahfg0dha5mmbvd5nsb38dlvyvrwq2gpr0j79138r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -70895,8 +70968,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "ireal"; - version = "0.2"; - sha256 = "0my93h51lfziqvqnnvzkrqpnc5bjg6blr46drd37861l5svid2a1"; + version = "0.2.1"; + sha256 = "0i9850l0k1w7vmdx4cs35789rf6j4i1xalpyrinf8x85f6c8mfxa"; buildDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -72269,18 +72342,18 @@ self: { "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath - , GenericPretty, hashable, hflags, lens, mtl, pretty, process + , GenericPretty, hashable, hflags, hint, lens, mtl, pretty, process , scientific, text, uniplate, unordered-containers, vector }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.4"; - sha256 = "10054yvzc4fql2wwhwnv3pl33vjgf2k4dgg1sz26k8x59629n5f7"; + version = "0.2.5.8"; + sha256 = "1p6pkhi50a81c4ldkqpvs8m2gmz1h3ayxhfshyy1dl06nrbfc0i0"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring containers filepath GenericPretty hashable - hflags lens mtl pretty process scientific text uniplate + hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; homepage = "https://github.com/mgajda/json-autotype"; @@ -75216,8 +75289,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "lca"; - version = "0.2.4"; - sha256 = "0dj7qz5wnrgqipmxim8y8jwgkwn8skkqxbd2w2kiy9s380pfdbsi"; + version = "0.3"; + sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza"; buildDepends = [ base ]; testDepends = [ base doctest ]; homepage = "http://github.com/ekmett/lca/"; @@ -75515,6 +75588,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens_4_8" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, comonad + , containers, contravariant, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, hlint, HUnit, kan-extensions, mtl, nats, parallel + , primitive, profunctors, QuickCheck, reflection, semigroupoids + , semigroups, simple-reflect, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.8"; + sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; + buildDepends = [ + array base bifunctors bytestring comonad containers contravariant + distributive exceptions filepath free ghc-prim hashable + kan-extensions mtl parallel primitive profunctors reflection + semigroupoids semigroups tagged template-haskell text transformers + transformers-compat unordered-containers vector void + ]; + testDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, comonad, contravariant, directory, doctest , filepath, lens, mtl, profunctors, semigroupoids, semigroups @@ -76809,18 +76916,12 @@ self: { }) {}; "linearscan" = callPackage - ({ mkDerivation, base, containers, free, hoopl, hspec - , hspec-expectations, lens, mtl, transformers - }: + ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.3.1.0"; - sha256 = "12gg7i8shvj0qxwaazysiw5f3xmdzqyv40da3qqyknndvwcvw84i"; - buildDepends = [ base containers transformers ]; - testDepends = [ - base containers free hoopl hspec hspec-expectations lens mtl - transformers - ]; + version = "0.4.0.0"; + sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs"; + buildDepends = [ base containers mtl transformers ]; homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; @@ -76832,8 +76933,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.1.0.0"; - sha256 = "19ahl0056szf49icv4sg0zcm2gmyy9sy8mj60d9c0iisj7qyblqj"; + version = "0.4.0.0"; + sha256 = "0kq4xcpgzrpadibh5ahli5pvb5rd9h1gnd1dzxddjz3plgxil803"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -76842,7 +76943,7 @@ self: { linearscan transformers ]; homepage = "http://github.com/jwiegley/linearscan-hoopl"; - description = "Make it easy to use the linearscan register allocator with Hoopl"; + description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80004,22 +80105,23 @@ self: { }) {}; "markup-preview" = callPackage - ({ mkDerivation, base, cmdargs, directory, glib, gtk, MissingH, mtl - , pandoc, temporary, text, transformers, webkit + ({ mkDerivation, base, cmdargs, directory, glib, gtk + , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text + , transformers, webkit }: mkDerivation { pname = "markup-preview"; - version = "0.2.2.0"; - sha256 = "0b2rll29qsr3cqq4vfaqjr4b5b1a9b4rg9cxbs98sspmpxka88m2"; + version = "0.2.2.1"; + sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs directory glib gtk MissingH mtl pandoc temporary text - transformers webkit + base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl + pandoc temporary text transformers webkit ]; jailbreak = true; description = "A simple markup document preview (markdown, textile, reStructuredText)"; - license = "unknown"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -81311,20 +81413,19 @@ self: { }) {}; "miniforth" = callPackage - ({ mkDerivation, base, containers, lens, MonadRandom, mtl, parsec - , parsec3-numbers, readline + ({ mkDerivation, base, containers, lens, MonadRandom, mtl + , mtl-compat, parsec, parsec3-numbers, readline }: mkDerivation { pname = "miniforth"; - version = "0.1.0.0"; - sha256 = "11np5zbbwmnsx6qqmxn7zi24bmk41xz5vi3wsvbv4cwvn4m4n6dm"; + version = "0.1.0.1"; + sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers lens MonadRandom mtl parsec parsec3-numbers - readline + base containers lens MonadRandom mtl mtl-compat parsec + parsec3-numbers readline ]; - jailbreak = true; description = "Miniature FORTH-like interpreter"; license = stdenv.lib.licenses.mit; }) {}; @@ -85448,8 +85549,10 @@ self: { }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.2"; - sha256 = "17rm2z931bvylcw3p9x2dkppyrqi6qgfyb03cdwr5iyasq5cjjvx"; + version = "0.0.3"; + sha256 = "04flihwgs4wibhppyjw7x23s2629rbywafbv9dmdcda6bv6d8qm3"; + isLibrary = true; + isExecutable = true; buildDepends = [ base containers GLFW-b mtl netwire-input stm ]; homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; @@ -85519,8 +85622,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.11.2"; - sha256 = "15ibasfam8c3gsq8szj6qpwf1gvcgdh3jq0a669dqh0mddx2a97v"; + version = "0.12.1"; + sha256 = "0nxd4rn4n87m5h3wi72rrm0bm7nx9b23bqsjbz3q05wi77cmg8c9"; buildDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -87607,6 +87710,7 @@ self: { pname = "opaleye"; version = "0.3.1"; sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; + editedCabalFile = "aad8d4a8bcd52a4668a5f04362af0a1443924b44369f753a184ae170a9a5ca9d"; buildDepends = [ attoparsec base case-insensitive contravariant old-locale postgresql-simple pretty product-profunctors profunctors semigroups @@ -87615,7 +87719,6 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -94095,10 +94198,9 @@ self: { pname = "product-profunctors"; version = "0.6"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "49b845d840379a6920f4dde4d88ce96a4b7b98760410db0874ed9a322b113d32"; + editedCabalFile = "d0b625cde02d967598b57bca429c61e9496b164b36db238b8f896d649230f4d1"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -94175,8 +94277,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "4.4"; - sha256 = "0q4ixqv4gkvxx3wsyvp0hys11h4mms90lvka1hp1ni3h739z7kyj"; + version = "4.4.1"; + sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -96414,15 +96516,15 @@ self: { }) {}; "rasterific-svg" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-html, bytestring - , containers, directory, filepath, FontyFruity, JuicyPixels, lens - , linear, mtl, optparse-applicative, Rasterific, scientific - , svg-tree, text, transformers, vector + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, FontyFruity, JuicyPixels, lens, linear, mtl + , optparse-applicative, Rasterific, scientific, svg-tree, text + , transformers, vector }: mkDerivation { pname = "rasterific-svg"; - version = "0.1.0.2"; - sha256 = "1jn6cj7baph2jvihr9aqrxcqwbn1vaa125n2d39s8ib6yar5x3sq"; + version = "0.1.0.3"; + sha256 = "1qzvqbkgj97wdiknlas57z2lfi311v0b5w68z6ni2il8hnnjrj64"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -96430,10 +96532,6 @@ self: { JuicyPixels lens linear mtl optparse-applicative Rasterific scientific svg-tree text transformers vector ]; - testDepends = [ - attoparsec base binary blaze-html bytestring directory filepath - FontyFruity JuicyPixels linear Rasterific svg-tree text - ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -97123,24 +97221,23 @@ self: { "redis-io" = callPackage ({ mkDerivation, async, attoparsec, auto-update, base, bytestring - , bytestring-conversion, containers, exceptions, mtl, network - , operational, redis-resp, resource-pool, tasty, tasty-hunit, time - , tinylog, transformers + , bytestring-conversion, containers, exceptions, monad-control, mtl + , network, operational, redis-resp, resource-pool, tasty + , tasty-hunit, time, tinylog, transformers, transformers-base }: mkDerivation { pname = "redis-io"; - version = "0.3.1"; - sha256 = "13ggija8f8mxdcslm94731cb2bq9jzjr979xybzy4c8csla49yhx"; + version = "0.4.1"; + sha256 = "0xd0dwkh8l7m75fp7sla8wf07hlgjlgqkpsj9cnwfg4g1gyx2yy2"; buildDepends = [ - attoparsec auto-update base bytestring containers exceptions mtl - network operational redis-resp resource-pool time tinylog - transformers + attoparsec auto-update base bytestring containers exceptions + monad-control mtl network operational redis-resp resource-pool time + tinylog transformers transformers-base ]; testDepends = [ async base bytestring bytestring-conversion containers redis-resp tasty tasty-hunit tinylog transformers ]; - jailbreak = true; homepage = "https://github.com/twittner/redis-io/"; description = "Yet another redis client"; license = "unknown"; @@ -97351,8 +97448,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "reflection"; - version = "1.5.1.1"; - sha256 = "0756jd8idkjfdpw3n9kwi57c2gqcv3g2ydzbpd8mzzhgglsn2zsv"; + version = "1.5.1.2"; + sha256 = "09fs42gmhdgfag7k4gm19l63sz5b1sxw6s3hgszpcnnsbv1g9ad4"; buildDepends = [ base template-haskell ]; homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; @@ -98375,6 +98472,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) llvm;}; + "repa-array" = callPackage + ({ mkDerivation, base, bytestring, double-conversion, mtl + , primitive, repa-eval, repa-stream, text, vector + }: + mkDerivation { + pname = "repa-array"; + version = "4.0.0.2"; + sha256 = "0169fqf07yqpx93n8qlq3yfnqv9rhc19r1a6rcvbrva7h8kh04nb"; + buildDepends = [ + base bytestring double-conversion mtl primitive repa-eval + repa-stream text vector + ]; + jailbreak = true; + homepage = "http://repa.ouroborus.net"; + description = "Bulk array representations and operators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-bytestring" = callPackage ({ mkDerivation, base, repa }: mkDerivation { @@ -98402,6 +98517,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) libdevil;}; + "repa-eval" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "repa-eval"; + version = "4.0.0.1"; + sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y"; + buildDepends = [ base ghc-prim ]; + homepage = "http://repa.ouroborus.net"; + description = "Low-level parallel operators on bulk random-accessble arrays"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-examples" = callPackage ({ mkDerivation, base, llvm, QuickCheck, random, repa , repa-algorithms, repa-io, template-haskell, vector @@ -98438,6 +98565,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-flow" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , primitive, repa-array, repa-eval, repa-stream, text, vector + }: + mkDerivation { + pname = "repa-flow"; + version = "4.0.0.2"; + sha256 = "1kznd1dl4rxwbc0k9asrwqm4pygq97x95g3zmy9v6lhbm6p1kpsd"; + buildDepends = [ + base bytestring containers directory filepath primitive repa-array + repa-eval repa-stream text vector + ]; + homepage = "http://repa.ouroborus.net"; + description = "Data-parallel data flows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-io" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, old-time, repa , vector @@ -98501,6 +98645,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "repa-stream" = callPackage + ({ mkDerivation, base, mtl, primitive, vector }: + mkDerivation { + pname = "repa-stream"; + version = "4.0.0.1"; + sha256 = "0vvkgazq30skj9yr763vc5vs3zacjssvyqci721n99j7h8my7r9x"; + buildDepends = [ base mtl primitive vector ]; + jailbreak = true; + homepage = "http://repa.ouroborus.net"; + description = "Stream functions not present in the vector library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-v4l2" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, deepseq, gloss , mtl, repa, transformers, v4l2, vector @@ -102010,7 +102167,7 @@ self: { description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL2; SDL2_ttf = null;}; + }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: @@ -105364,10 +105521,9 @@ self: { ({ mkDerivation, base, linear, vector }: mkDerivation { pname = "smoothie"; - version = "0.1.0.1"; - sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy"; + version = "0.1.1"; + sha256 = "0v5bj96ggw2j4jqzj4k6rdzklr6j0bpjgvxryiyjjw97f9q8fiwx"; buildDepends = [ base linear vector ]; - jailbreak = true; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several splines and polynomials"; license = stdenv.lib.licenses.bsd3; @@ -106698,14 +106854,14 @@ self: { }: mkDerivation { pname = "snowglobe"; - version = "3"; - sha256 = "1iaynfi1jsj4vx25n9xqliaq88dbrw5kd1d610wzcfxsvf7ilkly"; + version = "3.0.0.2"; + sha256 = "0l6hy0mza344k7m9skb6v9al611zgrrknhjdzx4ipqdd9zky9p23"; isLibrary = false; isExecutable = true; buildDepends = [ base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; - jailbreak = true; + homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -107397,8 +107553,8 @@ self: { ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { pname = "speculation"; - version = "1.5.0.1"; - sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0"; + version = "1.5.0.2"; + sha256 = "11d4v3x9phayx29lxl4na0b940ax27rjd867f7l9jb284p1rvhp5"; buildDepends = [ base ghc-prim stm transformers ]; homepage = "http://github.com/ekmett/speculation"; description = "A framework for safe, programmable, speculative parallelism"; @@ -110230,8 +110386,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1.0.1"; - sha256 = "1yypbd94436c38qvgq5cfc1f9bpiq26faxb12s0xyl6551gr6rac"; + version = "0.1.0.2"; + sha256 = "1fyq0pnh6i49wdx29dg4r9i7nb4dqs36y651cmp6bxkszzqrqka5"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -110266,8 +110422,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.0.1"; - sha256 = "0s9hwvxj2nk7w9qkjkqr8ah8lgxl43v04sdvjibh15rj8w4j2hms"; + version = "0.13.0.2"; + sha256 = "1d1aicj2krij6n0dxv1da501jk5am8rl463ghppgp2amkdxdmk2d"; buildDepends = [ base cairo glib mtl text ]; buildTools = [ gtk2hs-buildtools ]; pkgconfigDepends = [ librsvg ]; @@ -110307,8 +110463,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, containers }: mkDerivation { pname = "svm-light-utils"; - version = "0.1.1"; - sha256 = "08mifhbmwmd0n0zvgbfzs3mgf5hdvrmn8w3wa6cqn0cqk58z0a2j"; + version = "0.1.2"; + sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa"; buildDepends = [ attoparsec base bytestring containers ]; homepage = "http://github.com/bgamari/svm-light-utils"; description = "Parsers and formatters for the SVMlight input file format"; @@ -113877,14 +114033,16 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, template-haskell, th-lift + ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift , th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.9.1"; - sha256 = "04l9alpx51lqsw5l70krjjaf914wi1bmghcak514kyahv1xdcc8q"; - buildDepends = [ base template-haskell th-lift th-reify-many ]; + version = "0.11.0"; + sha256 = "1z7k0scz08s9c8fxvfsrfb8da5cgvnzr26mzj4cbz8syarygs9dk"; + buildDepends = [ + base mtl nats template-haskell th-lift th-reify-many + ]; testDepends = [ base hspec template-haskell ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; @@ -114696,19 +114854,14 @@ self: { }) {}; "time-patterns" = callPackage - ({ mkDerivation, base, intervals, lens, profunctors, thyme - , vector-space - }: + ({ mkDerivation, base, intervals, lens, thyme, vector-space }: mkDerivation { pname = "time-patterns"; - version = "0.1.2.0"; - sha256 = "1mjm40gwy3ddk844y7k8rjdb9zpw2rdz39d3n6mm8kbf36bh5fxq"; - buildDepends = [ - base intervals lens profunctors thyme vector-space - ]; - jailbreak = true; + version = "0.1.3.1"; + sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n"; + buildDepends = [ base intervals lens thyme vector-space ]; homepage = "https://bitbucket.org/jfmueller/time-patterns"; - description = "Patterns for reccurring events"; + description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -115580,8 +115733,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "traced"; - version = "2014.11.15"; - sha256 = "17yrlfn54il2xf8xnl1b06cwnmmyzkqxb0k7pqycrjmwsxzqkig2"; + version = "3000"; + sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9"; buildDepends = [ base containers mtl pretty ]; description = "Simple evaluation trace"; license = stdenv.lib.licenses.bsd3; @@ -115682,12 +115835,12 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "transformers_0_4_2_0" = callPackage + "transformers_0_4_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.4.2.0"; - sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr"; + version = "0.4.3.0"; + sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k"; buildDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -119202,6 +119355,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "users" = callPackage + ({ mkDerivation, aeson, base, path-pieces, text, time }: + mkDerivation { + pname = "users"; + version = "0.1.0.0"; + sha256 = "1svybj4sdkvcf1d5hm82szrc3s1rql9fcd8xxl1873qrvj4idjqq"; + buildDepends = [ aeson base path-pieces text time ]; + homepage = "https://github.com/agrafix/users"; + description = "A library simplifying user management for web applications"; + license = stdenv.lib.licenses.mit; + }) {}; + + "users-postgresql-simple" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, mtl + , postgresql-simple, text, time, users, users-test, uuid + }: + mkDerivation { + pname = "users-postgresql-simple"; + version = "0.1.0.1"; + sha256 = "1k0dmh3m7998x7rqrxiwfgvsw26cwk3fw923m2dyxrifyaqzc5lk"; + buildDepends = [ + aeson base bytestring mtl postgresql-simple text time users uuid + ]; + testDepends = [ base hspec postgresql-simple users-test ]; + homepage = "https://github.com/agrafix/users"; + description = "A PostgreSQL backend for the users package"; + license = stdenv.lib.licenses.mit; + }) {}; + + "users-test" = callPackage + ({ mkDerivation, aeson, base, hspec, text, users }: + mkDerivation { + pname = "users-test"; + version = "0.1.0.0"; + sha256 = "0r3k89j5ljdp24286xirkx6arcaagljvfvgi1qzc6r6imcnbgim6"; + buildDepends = [ aeson base hspec text users ]; + homepage = "https://github.com/agrafix/users"; + description = "Library to test backends for the users library"; + license = stdenv.lib.licenses.mit; + }) {}; + "utc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, clock , QuickCheck, test-framework, test-framework-quickcheck2, text @@ -119745,6 +119939,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validate-input" = callPackage + ({ mkDerivation, base, bytestring, either, mtl, pcre-heavy + , stringable, text + }: + mkDerivation { + pname = "validate-input"; + version = "0.1.0.0"; + sha256 = "1xbpgc2zkaszjydy15ir11vlrwg4pgclm6ldnjxmv3p2v1cswxq6"; + buildDepends = [ + base bytestring either mtl pcre-heavy stringable text + ]; + homepage = "https://github.com/agrafix/validate-input"; + description = "Input validation combinator library"; + license = stdenv.lib.licenses.mit; + }) {}; + "validation" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups @@ -119918,6 +120128,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vcache-trie" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-builder + , vcache + }: + mkDerivation { + pname = "vcache-trie"; + version = "0.1"; + sha256 = "0aln3vin1jah4c7hnhdbm4w5vsiqf3kgf48z6xdyzc0zwhv7mf1k"; + buildDepends = [ array base bytestring bytestring-builder vcache ]; + homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; + description = "patricia tries modeled above VCache"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vcard" = callPackage ({ mkDerivation, base, bytestring, containers, mime-directory }: mkDerivation { @@ -121866,8 +122090,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.0.9.2"; - sha256 = "0wr41drsklxkxl733v78fn05f8ylq7cq49hw3r4axrfmsmwd13p4"; + version = "3.0.9.3"; + sha256 = "1v4h60d5sbqmam17jnx4hvmvdsw5hd97bj8h9c5961d2xjgpzi6d"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network @@ -123934,8 +124158,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.1.5"; - sha256 = "1awflg2z6ixxngdy393q892anwpdibximkz21y95n022hl0wzlbr"; + version = "0.2.0"; + sha256 = "1388nw6ikk8myqq9h9if3fkdlxhzj7fs9l3hyfiv77k499j3iln9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -123946,10 +124170,9 @@ self: { base filepath HUnit language-python test-framework test-framework-hunit xcb-types ]; - jailbreak = true; homepage = "http://github.com/tych0/xcffib"; description = "A cffi-based python binding for X"; - license = stdenv.lib.licenses.mit; + license = "unknown"; }) {}; "xchat-plugin" = callPackage @@ -124810,12 +125033,12 @@ self: { , containers, dbus, directory, filepath, hinotify, HTTP, libmpd , libXpm, libXrandr, mtl, old-locale, parsec, process, regex-compat , stm, time, timezone-olson, timezone-series, transformers, unix - , utf8-string, wirelesstools, X11, X11-xft + , utf8-string, wirelesstools, X11, X11-xft, Xrender }: mkDerivation { pname = "xmobar"; - version = "0.22.1"; - sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz"; + version = "0.23"; + sha256 = "0nl3md4d8mzdch2i79ax09brwvm1d6b3rfxy52zbg4z05iv6grdv"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -124824,13 +125047,13 @@ self: { regex-compat stm time timezone-olson timezone-series transformers unix utf8-string X11 X11-xft ]; - extraLibraries = [ libXpm libXrandr wirelesstools ]; + extraLibraries = [ libXpm libXrandr wirelesstools Xrender ]; configureFlags = [ "-fall_extensions" ]; homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libXpm; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs) wirelesstools;}; + }) { Xrender = null; inherit (pkgs.xlibs) libXpm; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -125317,17 +125540,18 @@ self: { }) {}; "yabi-muno" = callPackage - ({ mkDerivation, base, bytestring, containers, lens, mtl, parsec - , yabi + ({ mkDerivation, base, bytestring, containers, lens, mtl + , mtl-compat, parsec }: mkDerivation { pname = "yabi-muno"; - version = "0.1.0.0"; - sha256 = "15p0bb3mclxxg3rmgx1im30l4s58msv5vvsm9wc6m9x79yyk9h8m"; + version = "0.1.0.1"; + sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg"; isLibrary = true; isExecutable = true; - buildDepends = [ base bytestring containers lens mtl parsec yabi ]; - jailbreak = true; + buildDepends = [ + base bytestring containers lens mtl mtl-compat parsec + ]; description = "Yet Another Brainfuck Interpreter"; license = stdenv.lib.licenses.mit; }) {}; @@ -125504,8 +125728,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.1.6"; - sha256 = "0f1wlq0j1xxz183siwhrrm67p35bbbyz4qi7f6qjwpy2qcn9zpyl"; + version = "0.3.1.7"; + sha256 = "0r6gkvxcd598c52z1s4rzbc80xgc571jcr3p5h0bwkn93b8bj5vf"; buildDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -127253,8 +127477,8 @@ self: { }: mkDerivation { pname = "yi-rope"; - version = "0.7.0.0"; - sha256 = "123p0m31h8qa53jl2sd646s1hrs5qnb7y82y7bzgg2zny4qqw9a2"; + version = "0.7.0.1"; + sha256 = "190rb5rbvdzy4d52dj3ih0kwzigh7v0fg412p3848pkv3836vmg0"; buildDepends = [ base binary bytestring charsetdetect-ae data-default deepseq fingertree text text-icu @@ -127932,10 +128156,9 @@ self: { ({ mkDerivation, base, bytestring, profunctors, zlib }: mkDerivation { pname = "zlib-lens"; - version = "0.1.1.1"; - sha256 = "1j37ic4v4q1wwysm4gf41f5bxd8ywr4qnqpxscigm0ghbwfs7f1z"; + version = "0.1.1.2"; + sha256 = "13zfh0639881nfxibl501f1b3ci9pjvhvdid2l5sf2na8kmpzr61"; buildDepends = [ base bytestring profunctors zlib ]; - jailbreak = true; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; From 11cce22637b67debec032638f2e88631e78e4eb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 11:42:37 +0100 Subject: [PATCH 095/174] haskell-ng: update configuration to transformers 0.4.3.0 --- .../haskell-modules/configuration-ghc-6.12.x.nix | 2 +- .../development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- .../development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- .../development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +- .../development/haskell-modules/configuration-ghc-7.6.x.nix | 2 +- .../development/haskell-modules/configuration-ghc-7.8.x.nix | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 25f6b146f1e..cccf5833c8a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -45,7 +45,7 @@ self: super: { deepseq = self.deepseq_1_3_0_1; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 982dd62cd8f..f676e223563 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -38,7 +38,7 @@ self: super: { deepseq = self.deepseq_1_4_0_0; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 7ac3f97d1ae..04cf2d9760f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -35,7 +35,7 @@ self: super: { deepseq = self.deepseq_1_4_0_0; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index f9228b9013b..0188be27a65 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -32,7 +32,7 @@ self: super: { unix = null; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index b12d3005013..24614529329 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -31,7 +31,7 @@ self: super: { unix = null; # transformers is not a core library for this compiler. - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; mtl = self.mtl_2_2_1; transformers-compat = disableCabalFlag super.transformers-compat "three"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index f98ca02e563..568a4d46c54 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -35,7 +35,7 @@ self: super: { xhtml = null; # mtl 2.2.x needs the latest transformers. - mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_2_0; }; + mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_3_0; }; # Configure build for mtl 2.1.x. mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; @@ -43,7 +43,7 @@ self: super: { # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); - transformers = super.transformers_0_4_2_0; + transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; haskeline = self.haskeline_0_7_1_3; mtl = super.mtl_2_2_1; @@ -119,7 +119,7 @@ self: super: { ) ]; }); mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_2_0; + transformers = self.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; hscolour = super.hscolour; time = self.time_1_5_0_1; From 17b7ade707483066207e794db006b8ce7ff3ca44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:16:33 +0100 Subject: [PATCH 096/174] haskell-vcache-trie has broken dependencies. --- 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 4492b42a6dd..1a59ec236b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -522,6 +522,7 @@ self: super: { # Depends on broken lmdb package. vcache = markBroken super.vcache; + vcache-trie = markBroken super.vcache-trie; # https://github.com/afcowie/http-streams/issues/80 http-streams = dontCheck super.http-streams; From 639ffffa8d0cee3acb67f0b626e789c75f4dadc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:19:32 +0100 Subject: [PATCH 097/174] haskell-influxdb build has been fixed. --- 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 1a59ec236b5..93f0befc704 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -344,6 +344,7 @@ self: super: { http-client-openssl = dontCheck super.http-client-openssl; http-client-tls = dontCheck super.http-client-tls; ihaskell = dontCheck super.ihaskell; + influxdb = dontCheck super.influxdb; itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; @@ -609,10 +610,6 @@ self: super: { # Broken by GLUT update. Monadius = markBroken super.Monadius; - # https://github.com/maoe/influxdb-haskell/issues/24 - influxdb = markBroken super.influxdb; - snaplet-influxdb = markBroken super.snaplet-influxdb; - # We don't have the groonga package these libraries bind to. haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; From 4481108acf861ce36102e3d8dfbc14795c529cd7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:19:50 +0100 Subject: [PATCH 098/174] haskell-configuration-common: cosmetic --- 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 93f0befc704..0d863556966 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -367,7 +367,7 @@ self: super: { persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; - postgresql-binary = dontCheck super.postgresql-binary;# needs a running postgresql server + postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; process-streaming = dontCheck super.process-streaming; punycode = dontCheck super.punycode; From dddf5158c3a9397d9c0761b65d15a85c61729e66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:29:28 +0100 Subject: [PATCH 099/174] haskell-snowglobe has been fixed. --- 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 0d863556966..7ab52bb4db6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -570,7 +570,6 @@ self: super: { karakuri = markBroken super.karakuri; # Upstream notified by e-mail. - snowglobe = markBroken super.snowglobe; gearbox = markBroken super.gearbox; # https://github.com/deech/fltkhs/issues/7 From f2fc20481163a34e4c64d4c48a366467f6901b06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:34:51 +0100 Subject: [PATCH 100/174] haskell-blip and haskell-xcffib don't compile. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7ab52bb4db6..367c3d5d1ab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -395,7 +395,6 @@ self: super: { WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw webdriver-angular = dontCheck super.webdriver-angular; webdriver = dontCheck super.webdriver; - xcffib = dontCheck super.xcffib; xsd = dontCheck super.xsd; # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test @@ -623,6 +622,12 @@ self: super: { # https://github.com/hunt-framework/hunt/issues/99 hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server; + # https://github.com/bjpop/blip/issues/16 + blip = markBroken super.blip; + + # https://github.com/tych0/xcffib/issues/37 + xcffib = markBroken super.xcffib; + } // { # Not on Hackage. From ba60dea5154199a46ce1c0ca8e0eccf394629215 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Mar 2015 11:48:58 +0100 Subject: [PATCH 101/174] haskell-snap: jailbreak to allows building with current versions of lens --- 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 367c3d5d1ab..2b7f15c1ee0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -628,6 +628,9 @@ self: super: { # https://github.com/tych0/xcffib/issues/37 xcffib = markBroken super.xcffib; + # https://github.com/snapframework/snap/issues/141 + # snap = overrideCabal super.snap (drv: { preConfigure = "sed -i -e 's|lens .*<4.8|lens|' snap.cabal"; }); + } // { # Not on Hackage. From f4958243d44f7857ff7c430ec0839bedd45f7d36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 11:43:38 +0100 Subject: [PATCH 102/174] haskell-chaselev-deque has been fixed. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b7f15c1ee0..f79599db7fc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -434,9 +434,6 @@ self: super: { # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; - # https://github.com/rrnewton/haskell-lockfree/issues/44 - chaselev-deque = markBrokenVersion "0.5.0.3" super.chaselev-deque; - # https://github.com/zouppen/stratum-tool/issues/14 stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool; From 46e5a39cdc4cc1f6a5414bffa5f039fc20f95f39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 12:14:33 +0100 Subject: [PATCH 103/174] haskell-users-postgresql-simple requires PostgreSQL running for its test suite. --- 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 f79599db7fc..c09cf799a16 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -233,6 +233,7 @@ self: super: { postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; test-sandbox = dontCheck super.test-sandbox; + users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1 xmlgen = dontCheck super.xmlgen; From 95cd118d4f52aef3c0ef46e8f6e71e8e2daa84be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 15:33:49 +0300 Subject: [PATCH 104/174] steam: refactor meta --- pkgs/games/steam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index a687270bfc9..0478e208da2 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ''} ''; - meta = { + meta = with stdenv.lib; { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; + license = licenses.unfree; + maintainers = with maintainers; [ jagajaga ]; }; } From 4aba7639c898f66e91ee71f8ed6df1df14f2419d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 17:13:27 +0300 Subject: [PATCH 105/174] chroot-env: build /etc --- .../build-support/build-fhs-chrootenv/env.nix | 37 ++++++++++++++++++- .../build-fhs-chrootenv/init.sh.in | 29 +-------------- .../build-fhs-userenv/chroot-user.rb | 20 ---------- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index ee18f86893b..19be38d1a01 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -89,7 +89,7 @@ let }; linkProfile = profile: '' - for i in ${profile}/{etc,bin,sbin,share,var}; do + for i in ${profile}/{bin,sbin,share,var}; do if [ -x "$i" ] then ln -s "$i" @@ -158,6 +158,40 @@ let cp -rsf ${chosenGcc.cc}/lib64/* lib64/ ''; + setupEtc = '' + mkdir -m0755 etc + + # copy profile content + cp -rsf ${staticUsrProfileTarget}/etc/* etc/ && chmod u+w -R etc/ + [ -d ${staticUsrProfileMulti}/etc ] && cp -rsf ${staticUsrProfileMulti}/etc/* etc/ && chmod u+w -R etc/ + + # compatibility with NixOS + ln -s /host-etc/static etc/static + + # symlink some NSS stuff + ln -s /host-etc/passwd etc/passwd + ln -s /host-etc/group etc/group + ln -s /host-etc/shadow etc/shadow + ln -s /host-etc/hosts etc/hosts + ln -s /host-etc/resolv.conf etc/resolv.conf + ln -s /host-etc/nsswitch.conf etc/nsswitch.conf + + # symlink other core stuff + ln -s /host-etc/localtime etc/localtime + ln -s /host-etc/machine-id etc/machine-id + + # symlink PAM stuff + rm -rf etc/pam.d + ln -s /host-etc/pam.d etc/pam.d + + # symlink fonts stuff + rm -rf etc/fonts + ln -s /host-etc/fonts etc/fonts + + # symlink ALSA stuff + ln -s /host-etc/asound.conf etc/asound.conf + ''; + in nixpkgs.stdenv.mkDerivation { name = "${name}-fhs"; buildCommand = '' @@ -165,6 +199,7 @@ in nixpkgs.stdenv.mkDerivation { cd $out ${setupTargetProfile} ${setupMultiProfile} + ${setupEtc} cd $out ${extraBuildCommands} cd $out diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in index f3bdad85fa7..9078a31fe46 100644 --- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in @@ -8,39 +8,12 @@ mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,home,var,run} # Symlink the software that should be part of the chroot system profile for i in @chrootEnv@/* do - if [ "$i" != "@chrootEnv@/etc" ] && [ "$i" != "@chrootEnv@/var" ] + if [ "$i" != "@chrootEnv@/var" ] then ln -s "$i" "$chrootenvDest" fi done -# Symlink the contents of the chroot software's /etc - -mkdir $chrootenvDest/etc - -for i in @chrootEnv@/etc/* -do - ln -s "$i" $chrootenvDest/etc -done - -# Symlink some NSS stuff -ln -s ../host-etc/passwd $chrootenvDest/etc/passwd -ln -s ../host-etc/group $chrootenvDest/etc/group -ln -s ../host-etc/shadow $chrootenvDest/etc/shadow -ln -s ../host-etc/hosts $chrootenvDest/etc/hosts -ln -s ../host-etc/resolv.conf $chrootenvDest/etc/resolv.conf -ln -s ../host-etc/nsswitch.conf $chrootenvDest/etc/nsswitch.conf - -# Symlink PAM stuff -rm $chrootenvDest/etc/pam.d -ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d - -# Symlink Font stuff -mkdir -p $chrootenvDest/etc/fonts -ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts -mkdir -p $chrootenvDest/etc/fonts/conf.d -ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d - # Create root folder mkdir $chrootenvDest/root diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 857ccd58cd7..7a066f1bc84 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -17,20 +17,6 @@ mounts = [ ['/nix/store', nil], mkdirs = ['tmp', ] -# Symlinks: [from, to (dir)] -symlinks = - # /etc symlinks: [file name, prefix in host-etc] - [ ['passwd', ''], - ['group', ''], - ['shadow', ''], - ['hosts', ''], - ['resolv.conf', ''], - ['nsswitch.conf', ''], - ['pam.d', 'static'], - ['fonts/fonts.conf', 'static'], - ['fonts/conf.d/00-nixos.conf', 'static'], - ].map! { |x| [ "host-etc/#{x[1]}/#{x[0]}", "etc/#{File.dirname x[0]}" ] } - require 'tmpdir' require 'fileutils' require 'pathname' @@ -111,12 +97,6 @@ if $cpid == 0 Dir.chroot root Dir.chdir '/' - # Do symlinks - symlinks.each do |x| - FileUtils.mkdir_p x[1] - FileUtils.ln_s x[0], x[1] - end - # Symlink swdir hierarchy mount_dirs = Set.new mounts.map { |x| Pathname.new x[1] } link_swdir = lambda do |swdir, prefix| From e3ab3df26e418c8f964b57e990144572a86580d0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 17:13:53 +0300 Subject: [PATCH 106/174] chroot-env: ignore collisions and fix permissions --- pkgs/build-support/build-fhs-chrootenv/env.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index 19be38d1a01..a50917a96cd 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -81,11 +81,13 @@ let staticUsrProfileTarget = nixpkgs.buildEnv { name = "system-profile-target"; paths = basePkgs ++ [ profilePkg ] ++ targetPaths; + ignoreCollisions = true; }; staticUsrProfileMulti = nixpkgs.buildEnv { name = "system-profile-multi"; paths = multiPaths; + ignoreCollisions = true; }; linkProfile = profile: '' @@ -129,7 +131,7 @@ let mkdir -m0755 lib # copy content of targetPaths - cp -rsf ${staticUsrProfileTarget}/lib/* lib/ + cp -rsf ${staticUsrProfileTarget}/lib/* lib/ && chmod u+w -R lib/ ''; # setup /lib, /lib32 and /lib64 @@ -142,16 +144,16 @@ let cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/ # copy content of multiPaths (32bit libs) - [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ + [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ && chmod u+w -R lib/ # copy content of targetPaths (64bit libs) - cp -rsf ${staticUsrProfileTarget}/lib/* lib64/ + cp -rsf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/ # most 64bit only libs put their stuff into /lib # some pkgs (like gcc_multi) put 32bit libs into and /lib 64bit libs into /lib64 # by overwriting these we will hopefully catch all these cases # in the end /lib should only contain 32bit and /lib64 only 64bit libs - cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/ + cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/ && chmod u+w -R lib64/ # copy gcc libs (and may overwrite exitsting wrongly placed libs) cp -rsf ${chosenGcc.cc}/lib/* lib/ From 3e395b71da1f99eb5ace8d99adb4b1f76424c3d6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 17:14:27 +0300 Subject: [PATCH 107/174] chroot-env: add locales, refactor environment --- pkgs/build-support/build-fhs-chrootenv/env.nix | 5 ++++- pkgs/build-support/build-fhs-chrootenv/load.sh.in | 8 +++++++- pkgs/build-support/build-fhs-userenv/chroot-user.rb | 12 +++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index a50917a96cd..d80e2869e5e 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -62,7 +62,7 @@ let chosenGcc bashInteractive coreutils less shadow su gawk diffutils findutils gnused gnugrep - gnutar gzip bzip2 xz + gnutar gzip bzip2 xz glibcLocales ]; # Compose a global profile for the chroot environment @@ -72,6 +72,9 @@ let mkdir -p $out/etc cat >> $out/etc/profile << "EOF" export PS1='${name}-chrootenv:\u@\h:\w\$ ' + export LOCALE_ARCHIVE='/usr/lib${if is64Bit then "64" else ""}/locale/locale-archive' + export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 + export PATH='/bin:/sbin' ${profile} EOF ''; diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in index 6089fa27585..99da20c34b2 100644 --- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in @@ -3,4 +3,10 @@ chrootenvDest=/run/chrootenv/@name@ # Enter the LFS chroot environment -sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login +sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i \ + TERM="$TERM" \ + DISPLAY="$DISPLAY" \ + HOME="$HOME" \ + XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" \ + LANG="$LANG" \ + /bin/bash --login diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 7a066f1bc84..35608bd3eb6 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -116,13 +116,11 @@ if $cpid == 0 link_swdir.call swdir, Pathname.new('') # New environment - oldenv = ENV.to_h - ENV.replace({ 'PS1' => oldenv['PS1'], - 'TERM' => oldenv['TERM'], - 'DISPLAY' => oldenv['DISPLAY'], - 'HOME' => oldenv['HOME'], - 'PATH' => '/bin:/sbin', - 'XDG_RUNTIME_DIR' => oldenv['XDG_RUNTIME_DIR'], + ENV.replace({ 'TERM' => ENV['TERM'], + 'DISPLAY' => ENV['DISPLAY'], + 'HOME' => ENV['HOME'], + 'XDG_RUNTIME_DIR' => ENV['XDG_RUNTIME_DIR'], + 'LANG' => ENV['LANG'], }) # Finally, exec! From e01cd8f214644f5e0fb877965c3344d6aceaec9b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 17:28:42 +0300 Subject: [PATCH 108/174] steam: fix sound issues --- pkgs/games/steam/chrootenv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 68530456462..d66a2a2ab69 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -66,8 +66,8 @@ buildFHSUserEnv { ''; profile = '' - export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 - export PATH=$PATH:/usr/bin:/usr/sbin + # Ugly workaround for https://github.com/ValveSoftware/steam-for-linux/issues/3504 + export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so ''; runScript = "exec steam"; From a2f4b94dbe03ff0b353a2357fe2c2026cbc07334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 9 Mar 2015 11:50:44 +0100 Subject: [PATCH 109/174] Add pcsc-tools, to test ccid cards. --- pkgs/tools/security/pcsctools/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/pcsctools/default.nix diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix new file mode 100644 index 00000000000..a72556447cd --- /dev/null +++ b/pkgs/tools/security/pcsctools/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, pcsclite }: + +stdenv.mkDerivation rec { + name = "pcsc-tools-1.4.23"; + + src = fetchurl { + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz"; + sha256 = "1qjgvvvwhykmzn4js9s3rjnp9pbjc3sz4lb4d7i9kvr3xsv7pjk9"; + }; + + buildInputs = [ udev dbus_libs perl pcsclite ]; + + preBuild = '' + makeFlags=DESTDIR=$out + ''; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Tools used to test a PC/SC driver, card or reader"; + homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; + license = licenses.gpl2plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36089c511ae..93cd75bad94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2267,6 +2267,8 @@ let pcsclite = callPackage ../tools/security/pcsclite { }; + pcsctools = callPackage ../tools/security/pcsctools { }; + pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; From a22c19f56ad74d81e3120d466003832eaec0415d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 9 Mar 2015 15:37:14 +0100 Subject: [PATCH 110/174] Fixing judy for gcc 4.8 gtkwave crashes often, without this fix. http://sourceforge.net/p/judy/mailman/message/31995144/ --- pkgs/development/libraries/judy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 4199becb06d..4bca61d5b14 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation { sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; + # gcc 4.8 optimisations break judy. + # http://sourceforge.net/p/judy/mailman/message/31995144/ + preConfigure = '' + configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") + ''; + meta = { homepage = http://judy.sourceforge.net/; license = stdenv.lib.licenses.lgpl21Plus; From 0619c852cbe48a95cb872a3abee9f1aef4727655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Feb 2015 00:02:26 +0100 Subject: [PATCH 111/174] automake: use 1.14.* as the default I see 1.15 has been released recently, but that's probably too new to be the default. --- .../gnome-3/3.12/core/gnome-contacts/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 4 ++-- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +++-------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix index 5b4ca5c3418..49bd7ac70f4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret , bash, makeWrapper, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: +, libsoup, vala, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { name = "gnome-contacts-3.12.0"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.gnome_icon_theme librsvg hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; + vala automake autoconf db ]; preFixup = '' for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index 0d5cc4d1427..13ea6bb391c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, libxml2, upower , pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf +, bash, makeWrapper, itstool, vala, sqlite, automake, autoconf , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler, libtool , icu, taglib, libjpeg, libtiff, giflib, libcue @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool + automake autoconf libtool gnome3.gsettings_desktop_schemas makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index a7e42a07a63..35468d1351f 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoconf -, automake114x +, automake , findutils # for xargs , gettext_0_19 , libtool @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4"; }; - buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ]; + buildInputs = [ autoconf automake gettext_0_19 libtool makeWrapper texinfo ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93cd75bad94..89725294bdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1300,9 +1300,7 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - automake = automake114x; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; @@ -4397,7 +4395,6 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; - automake = automake114x; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; pythonProtobuf = pythonPackages.protobuf; }; @@ -4699,7 +4696,7 @@ let autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = automake112x; + automake = automake114x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -5246,9 +5243,7 @@ let adns = callPackage ../development/libraries/adns { }; - afflib = callPackage ../development/libraries/afflib { - automake = automake114x; - }; + afflib = callPackage ../development/libraries/afflib { }; agg = callPackage ../development/libraries/agg { }; From 8743003935692858d507589787ae46c3aa94a638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Feb 2015 22:06:05 +0100 Subject: [PATCH 112/174] grep: update The 2.21 update fixes NixOS/nix#464. --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 0380d2d2467..e0dcd4eadf9 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv }: -let version = "2.20"; in +let version = "2.21"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; + sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"; }; buildInputs = [ pcre libiconv ]; From 0ffb98828e876129eda8c01da288fe676b1fc2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Feb 2015 23:39:27 +0100 Subject: [PATCH 113/174] libtool: update I see nothing dangerous in NEWS. Also refactored the expression. --- .../tools/misc/libtool/libtool2.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index d0cc086a9a6..443915d71e9 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, m4, perl, lzma }: +{ stdenv, fetchurl, m4, perl, help2man }: -stdenv.mkDerivation (rec { - name = "libtool-2.4.2"; +stdenv.mkDerivation rec { + name = "libtool-2.4.5"; src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; - sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; + sha256 = "11v9gl8ancavx7179n6zk4k8hwa0zl4wz4w9z3mffk71gnfb972h"; }; - nativeBuildInputs = [ lzma m4 perl ]; + propagatedNativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ perl help2man ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! @@ -18,6 +19,10 @@ stdenv.mkDerivation (rec { # leads to the failure of a number of tests. doCheck = false; + # Don't run the native `strip' when cross-compiling. This breaks at least + # with `.a' files for MinGW. + dontStrip = stdenv ? cross; + meta = { description = "GNU Libtool, a generic library support script"; @@ -39,10 +44,3 @@ stdenv.mkDerivation (rec { }; } -// - -# Don't run the native `strip' when cross-compiling. This breaks at least -# with `.a' files for MinGW. -(if (stdenv ? cross) - then { dontStrip = true; } - else { })) From db847a334504bed28014c60da1c7fb4395e4369f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Feb 2015 10:58:35 +0100 Subject: [PATCH 114/174] recode: fix build, needing texinfo now Also make the build inputs native (no references are retained). --- pkgs/tools/text/recode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 21b35682e4e..bf95125b208 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,6 +1,6 @@ # XXX: this may need -liconv on non-glibc systems.. -{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }: +{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, texinfo }: stdenv.mkDerivation rec { name = "recode-3.7-2fd838565"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - buildInputs = [ python perl autoconf automake libtool intltool flex ]; + nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo ]; preConfigure = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 From 263d5239d6dbcfddd2b1a47bc4a1ddd729ce7632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Feb 2015 15:03:34 +0100 Subject: [PATCH 115/174] gnugrep: fix CVE-2015-1345 by upstream patch --- pkgs/tools/text/gnugrep/cve-2015-1345.patch | 60 +++++++++++++++++++++ pkgs/tools/text/gnugrep/default.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/text/gnugrep/cve-2015-1345.patch diff --git a/pkgs/tools/text/gnugrep/cve-2015-1345.patch b/pkgs/tools/text/gnugrep/cve-2015-1345.patch new file mode 100644 index 00000000000..7156f475e7e --- /dev/null +++ b/pkgs/tools/text/gnugrep/cve-2015-1345.patch @@ -0,0 +1,60 @@ +From 83a95bd8c8561875b948cadd417c653dbe7ef2e2 Mon Sep 17 00:00:00 2001 +From: Yuliy Pisetsky +Date: Thu, 01 Jan 2015 23:36:55 +0000 +Subject: grep -F: fix a heap buffer (read) overrun + +grep's read buffer is often filled to its full size, except when +reading the final buffer of a file. In that case, the number of +bytes read may be far less than the size of the buffer. However, for +certain unusual pattern/text combinations, grep -F would mistakenly +examine bytes in that uninitialized region of memory when searching +for a match. With carefully chosen inputs, one can cause grep -F to +read beyond the end of that buffer altogether. This problem arose via +commit v2.18-90-g73893ff with the introduction of a more efficient +heuristic using what is now the memchr_kwset function. The use of +that function in bmexec_trans could leave TP much larger than EP, +and the subsequent call to bm_delta2_search would mistakenly access +beyond end of the main input read buffer. + +* src/kwset.c (bmexec_trans): When TP reaches or exceeds EP, +do not call bm_delta2_search. +* tests/kwset-abuse: New file. +* tests/Makefile.am (TESTS): Add it. +* THANKS.in: Update. +* NEWS (Bug fixes): Mention it. + +Prior to this patch, this command would trigger a UMR: + + printf %0360db 0 | valgrind src/grep -F $(printf %019dXb 0) + + Use of uninitialised value of size 8 + at 0x4142BE: bmexec_trans (kwset.c:657) + by 0x4143CA: bmexec (kwset.c:678) + by 0x414973: kwsexec (kwset.c:848) + by 0x414DC4: Fexecute (kwsearch.c:128) + by 0x404E2E: grepbuf (grep.c:1238) + by 0x4054BF: grep (grep.c:1417) + by 0x405CEB: grepdesc (grep.c:1645) + by 0x405EC1: grep_command_line_arg (grep.c:1692) + by 0x4077D4: main (grep.c:2570) + +See the accompanying test for how to trigger the heap buffer overrun. + +Thanks to Nima Aghdaii for testing and finding numerous +ways to break early iterations of this patch. + +Nix: @vcunat restricted this to the runtime code only to avoid needing autoreconfiguration. +--- +diff --git a/src/kwset.c b/src/kwset.c +index 4003c8d..376f7c3 100644 +--- a/src/kwset.c ++++ b/src/kwset.c +@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + if (! tp) + return -1; + tp++; ++ if (ep <= tp) ++ break; + } + } + } diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e0dcd4eadf9..e73458d0aba 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"; }; + patches = [ ./cve-2015-1345.patch ]; + buildInputs = [ pcre libiconv ]; doCheck = !stdenv.isDarwin; From c65a2121e07a57a0d82ae049f661c38eefa295ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 11:49:17 +0100 Subject: [PATCH 116/174] glibc: fix -lgcc_s linking https://github.com/NixOS/nixpkgs/commit/65221567c12eb20d12#commitcomment-9515597 --- pkgs/development/libraries/glibc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index b0a28406473..f60df4a30d6 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -36,6 +36,7 @@ in if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + ln -s libgcc_s.so.1 $out/lib/libgcc_s.so fi ''; From c4ac05d47e553d6c5f0d4fef878d36fc9dc3ecc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 15:57:04 +0100 Subject: [PATCH 117/174] libdrm: update --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 12e25b03a7b..ecc92fce40c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.58"; + name = "libdrm-2.4.59"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd"; + sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; }; nativeBuildInputs = [ pkgconfig ]; From 464212e01a1d53f9d39360094b4e985bbaab28e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:19:32 +0100 Subject: [PATCH 118/174] dbus: security bump to fix CVE-2015-0245 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f6c42f2136c..8fc75721c23 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.8.14"; - sha256 = "06hzrvlpm91c4a4a19bk5pzxvs00fwd7fjd3njd3pjd4lr854hl3"; + version = "1.8.16"; + sha256 = "01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz"; inherit (stdenv) lib; From 9c22c1b3d719bed71e54821e5c95e17c38e59d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:22:13 +0100 Subject: [PATCH 119/174] xorg: update various modules --- pkgs/servers/x11/xorg/default.nix | 46 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 14 ++++---- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index da537c5c453..2ffa65debb9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -25,11 +25,11 @@ let }) // {inherit ;}; bdftopcf = (mkDerivation "bdftopcf" { - name = "bdftopcf-1.0.4"; + name = "bdftopcf-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2; - sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga"; + url = mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2; + sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q"; }; buildInputs = [pkgconfig libXfont ]; }) // {inherit libXfont ;}; @@ -515,11 +515,11 @@ let }) // {inherit ;}; iceauth = (mkDerivation "iceauth" { - name = "iceauth-1.0.6"; + name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2; - sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx"; + url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; + sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; buildInputs = [pkgconfig libICE xproto ]; }) // {inherit libICE xproto ;}; @@ -895,11 +895,11 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.2"; + name = "libpciaccess-0.13.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2; - sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2; + sha256 = "1qy2i776jb7912dxqylv59p41sa0hw8lmn7asd3ywvp0wk56rmvc"; }; buildInputs = [pkgconfig zlib ]; }) // {inherit zlib ;}; @@ -935,11 +935,11 @@ let }) // {inherit kbproto libX11 ;}; libxshmfence = (mkDerivation "libxshmfence" { - name = "libxshmfence-1.1"; + name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2; - sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv"; + url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; + sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -985,11 +985,11 @@ let }) // {inherit ;}; mkfontscale = (mkDerivation "mkfontscale" { - name = "mkfontscale-1.1.1"; + name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2; - sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14"; + url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; + sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; }) // {inherit libfontenc freetype xproto zlib ;}; @@ -1065,11 +1065,11 @@ let }) // {inherit ;}; sessreg = (mkDerivation "sessreg" { - name = "sessreg-1.0.8"; + name = "sessreg-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2; - sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf"; + url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2; + sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am"; }; buildInputs = [pkgconfig xproto ]; }) // {inherit xproto ;}; @@ -1561,8 +1561,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -2025,11 +2025,11 @@ let }) // {inherit libX11 xproto ;}; xproto = (mkDerivation "xproto" { - name = "xproto-7.0.26"; + name = "xproto-7.0.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2; - sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3"; + url = mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2; + sha256 = "030ix881p0crnd4bc01nz6cs0afmfv6ivsyyhf0h1j1mnak26vr4"; }; buildInputs = [pkgconfig ]; }) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index bb1c5b9291f..0ca8d6b5fc7 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 @@ -47,16 +47,16 @@ mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 -mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 +mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2 @@ -88,13 +88,13 @@ mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2 mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 From a3e0ee10e541417b260339f3a96a9189f4b9d94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Feb 2015 16:22:44 +0100 Subject: [PATCH 120/174] xf86-video-vmware: update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2ffa65debb9..55bc13f2273 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1765,11 +1765,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (mkDerivation "xf86videovmware" { - name = "xf86-video-vmware-13.0.2"; + name = "xf86-video-vmware-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2; - sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2; + sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 0ca8d6b5fc7..e199672942d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -154,7 +154,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From 4731485ca2edefcb95f5512907c1b90adafc1eb3 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Fri, 20 Feb 2015 16:29:52 +0100 Subject: [PATCH 121/174] llvm-3.5: enable RTTI to support mesa Extracted from #6367. --- pkgs/development/compilers/llvm/3.5/llvm.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index bacd0b26643..7e11caa66f0 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_REQUIRES_RTTI=1" ] ++ stdenv.lib.optionals (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89725294bdb..98f46031305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3735,6 +3735,7 @@ let llvm = llvmPackages.llvm; + llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; From aa564bbac53fe8977f551b06c39458389747d3e7 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Sun, 22 Feb 2015 19:11:38 +0100 Subject: [PATCH 122/174] mesa: big update, and related improvements (close #6367) * Remove upstreamed patch * EGL driver dirs are no longer a thing, see mesa commit 407450eb84f5a1b466a2eff19b85cdee7ac15dfb Patching runtime search dir in sources instead (by vcunat). * static-gallium patch dropped as it causes visibility issues with nouveau * rtti patch dropped as it the relevant configuration has been removed upstream; properly fixed by an LLVM flag now * Checks disabled. This is known and solved upstream. Checks will be re-enabled in a future commit when updating to a version containing the fixes * Use llvm-3.5 now (by vcunat). --- pkgs/development/libraries/mesa/default.nix | 32 +++------ pkgs/development/libraries/mesa/rtti.patch | 72 ------------------- .../libraries/mesa/static-gallium.patch | 64 ----------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 11 insertions(+), 159 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/rtti.patch delete mode 100644 pkgs/development/libraries/mesa/static-gallium.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d562b2364d4..875dabc3734 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -15,16 +15,15 @@ else - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - - DRI and EGL drivers are compiled into $drivers output, - which is much bigger and depends on LLVM. - These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*" - and so are kind-of impure (given by NixOS). + - DRI drivers are compiled into $drivers output, which is much bigger and + depends on LLVM. These should be searched at runtime in + "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) - libOSMesa is in $osmesa (~4 MB) */ let - version = "10.2.9"; + version = "10.4.5"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -38,46 +37,35 @@ stdenv.mkDerivation { "https://launchpad.net/mesa/trunk/${version}/+download/MesaLib-${version}.tar.bz2" "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2" ]; - sha256 = "f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d"; + sha256 = "bf60000700a9d58e3aca2bfeee7e781053b0d839e61a95b1883e05a2dee247a0"; }; prePatch = "patchShebangs ."; patches = [ - ./static-gallium.patch ./glx_ro_text_segm.patch # fix for grsecurity/PaX # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog - (fetchpatch { - name = "fix-lp_test_arit.diff"; - url = "http://cgit.freedesktop.org/mesa/mesa/patch/" - + "?id=8148a06b8fdb734f7f9a11ce787ee6505939fdaa"; - sha256 = "0k2bnl7d28nx2y88jchw6jj4f3xfdjjvz4vpvhc40060c2iz8fla"; - }) ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; inherit udev; }); - # Change the search path for EGL drivers from $drivers/* to driverLink postPatch = '' - sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \ - -i src/egl/main/Makefile.am - '' + /* work around RTTI LLVM problems */ '' - patch -R -p1 < ${./rtti.patch} + substituteInPlace src/egl/main/egldriver.c \ + --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"' ''; outputs = ["out" "drivers" "osmesa"]; configureFlags = [ "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-egl-driver-dir=$(drivers)/lib/egl" "--with-dri-searchpath=${driverLink}/lib/dri" "--enable-dri" "--enable-glx-tls" - "--enable-shared-glapi" "--enable-shared-gallium" + "--enable-shared-glapi" "--enable-driglx-direct" # seems enabled anyway "--enable-gallium-llvm" "--enable-llvm-shared-libs" "--enable-xa" # used in vmware driver @@ -112,7 +100,7 @@ stdenv.mkDerivation { ; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big @@ -178,6 +166,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = "bsd"; platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ simons vcunat ]; + maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ]; }; } diff --git a/pkgs/development/libraries/mesa/rtti.patch b/pkgs/development/libraries/mesa/rtti.patch deleted file mode 100644 index 6b123139013..00000000000 --- a/pkgs/development/libraries/mesa/rtti.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://lists.freedesktop.org/archives/mesa-dev/2013-October/046311.html - -* As discussed on the mailing list, - forced no-rtti breaks C++ public - API's such as the Haiku C++ libGL.so -* -fno-rtti *can* be still set however - instead of blindly forcing -fno-rtti, - we can rely on the llvm-config - --cppflags output. - If the system llvm is built without - rtti (default), the no-rtti flag will be - present in llvm-config --cppflags - (which we pick up on) - If llvm is built with rtti - (REQUIRES_RTTI=1), then -fno-rtti is - removed from llvm-config --cppflags. -* We could selectively add / remove rtti - from various components, however mixing - rtti and non-rtti code is tricky and - could introduce bugs. -* This needs impact tested. ---- - configure.ac | 1 - - scons/llvm.py | 3 --- - src/gallium/auxiliary/Makefile.am | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0d082d2..3335575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1943,7 +1943,6 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) - AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) - AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) - AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1) --AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302) - - AC_SUBST([ELF_LIB]) - -diff --git a/scons/llvm.py b/scons/llvm.py -index 7cd609c..c1c3736 100644 ---- a/scons/llvm.py -+++ b/scons/llvm.py -@@ -195,9 +195,6 @@ def generate(env): - if llvm_version >= distutils.version.LooseVersion('3.1'): - components.append('mcjit') - -- if llvm_version >= distutils.version.LooseVersion('3.2'): -- env.Append(CXXFLAGS = ('-fno-rtti',)) -- - env.ParseConfig('llvm-config --libs ' + ' '.join(components)) - env.ParseConfig('llvm-config --ldflags') - except OSError: -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index 670e124..2d2d8d4 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -25,12 +25,6 @@ AM_CXXFLAGS += \ - $(GALLIUM_CFLAGS) \ - $(LLVM_CXXFLAGS) - --if LLVM_NEEDS_FNORTTI -- --AM_CXXFLAGS += -fno-rtti -- --endif -- - libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) --- -1.8.4 diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch deleted file mode 100644 index bb3f60eaf88..00000000000 --- a/pkgs/development/libraries/mesa/static-gallium.patch +++ /dev/null @@ -1,64 +0,0 @@ -117-static-gallium.patch from Ubuntu Trusty - -diff --git a/configure.ac b/configure.ac -index b9fcb0b..be89843 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -747,6 +747,19 @@ if test "x$enable_shared_glapi" = xyes; then - fi - AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) - -+AC_ARG_ENABLE([shared-gallium], -+ [AS_HELP_STRING([--enable-shared-gallium], -+ [Enable shared gallium core @<:@default=yes@:>@])], -+ [enable_shared_gallium="$enableval"], -+ [enable_shared_gallium=yes]) -+ -+SHARED_GALLIUM="0" -+if test "x$enable_shared_gallium" = xyes; then -+ SHARED_GALLIUM="1" -+fi -+AC_SUBST([SHARED_GALLIUM]) -+AM_CONDITIONAL(HAVE_SHARED_GALLIUM, test $SHARED_GALLIUM = 1) -+ - dnl - dnl Driver specific build directories - dnl -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index f14279b..3cdec83 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -3,14 +3,19 @@ AUTOMAKE_OPTIONS = subdir-objects - include Makefile.sources - include $(top_srcdir)/src/gallium/Automake.inc - --noinst_LTLIBRARIES = libgallium.la -- - AM_CFLAGS = \ - -I$(top_srcdir)/src/gallium/auxiliary/util \ -- $(GALLIUM_CFLAGS) \ -- $(VISIBILITY_CFLAGS) -+ $(GALLIUM_CFLAGS) - --AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -+AM_CXXFLAGS = -+ -+if HAVE_SHARED_GALLIUM -+lib_LTLIBRARIES = libgallium.la -+else -+noinst_LTLIBRARIES = libgallium.la -+AM_CFLAGS += $(VISIBILITY_CFLAGS) -+AM_CXXFLAGS += $(VISIBILITY_CXXFLAGS) -+endif - - libgallium_la_SOURCES = \ - $(C_SOURCES) \ -@@ -29,6 +34,8 @@ if LLVM_NEEDS_FNORTTI - - AM_CXXFLAGS += -fno-rtti - -+libgallium_la_LIBADD = $(LLVM_LIBS) -+ - endif - - libgallium_la_SOURCES += \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f46031305..27fc19fac35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6783,7 +6783,7 @@ let # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity grsecEnabled = true; - llvm = llvm_34; + llvm = llvm_35; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); mesa_drivers = mesaDarwinOr ( From e2b033cad945134f7205e052562d0a146987331a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Feb 2015 21:55:27 +0100 Subject: [PATCH 123/174] ghc: re-instate code that configures statically linked builds by default The compiler should not expect to have dynamic versions of all libraries available, because that configuration doesn't play along nicely with statically linked libraries. Fixes https://github.com/NixOS/nixpkgs/issues/6399. --- pkgs/development/compilers/ghc/7.8.4.nix | 1 + pkgs/development/compilers/ghc/head.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index e9e1e1eafd0..c4000fc86c2 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0363855977f..4cde21dbcc2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,6 +7,7 @@ let libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + DYNAMIC_BY_DEFAULT = NO ${stdenv.lib.optionalString stdenv.isDarwin '' libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" From c4ff9d10bab7317d7d47a3b21717e8e4c5e8bf3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Feb 2015 11:45:49 +0100 Subject: [PATCH 124/174] haskell-generic-builder: consistently use $TMPDIR to refer to the designated place for temporary files Resolves https://github.com/NixOS/nixpkgs/issues/6525. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6b2926ef2d2..7d5a9dd5903 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation ({ export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - packageConfDir="$TMP/package.conf.d" + packageConfDir="$TMPDIR/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" From f43d759bc410de0f04523c8f13979e529794ddbd Mon Sep 17 00:00:00 2001 From: mancha Date: Mon, 23 Feb 2015 23:13:00 +0000 Subject: [PATCH 125/174] unzip: fix CVE-2014-9636 patch Close #6544, fixes #6543. vcunat: no security impact; just fixes false rejections of some rarer inputs - a problem introduced by the CVE patch. --- pkgs/tools/archivers/unzip/CVE-2014-9636.diff | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff index aeaf3e70de6..d4c7f752975 100644 --- a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff +++ b/pkgs/tools/archivers/unzip/CVE-2014-9636.diff @@ -1,6 +1,6 @@ -From a9bfab5b52d08879bbc5e0991684b700127ddcff Mon Sep 17 00:00:00 2001 +From 190040ebfcf5395a6ccedede2cc9343d34f0a108 Mon Sep 17 00:00:00 2001 From: mancha -Date: Mon, 3 Nov 2014 +Date: Wed, 11 Feb 2015 Subject: Info-ZIP UnZip buffer overflow By carefully crafting a corrupt ZIP archive with "extra fields" that @@ -26,12 +26,13 @@ This patch ensures that when extra fields use STORED mode, the if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ -@@ -2226,6 +2227,12 @@ static int test_compr_eb(__G__ eb, eb_si +@@ -2226,6 +2227,13 @@ static int test_compr_eb(__G__ eb, eb_si eb_size <= (compr_offset + EB_CMPRHEADLEN))) return IZ_EF_TRUNC; /* no compressed data! */ + method = makeword(eb + (EB_HEADSIZE + compr_offset)); -+ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ if ((method == STORED) && ++ (eb_size - compr_offset - EB_CMPRHEADLEN != eb_ucsize)) + return PK_ERR; /* compressed & uncompressed + * should match in STORED + * method */ From aae9e49cbc0c8211532cb43c03cd73a97079a2bc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 24 Feb 2015 10:51:46 +0100 Subject: [PATCH 126/174] Add setup-hook to hicolor_icon_theme --- .../graphics/shotwell/default.nix | 1 - .../data/icons/hicolor-icon-theme/default.nix | 2 ++ .../icons/hicolor-icon-theme/setup-hook.sh | 20 +++++++++++++++++++ .../gnome-3/3.12/apps/bijiben/default.nix | 1 - .../gnome-3/3.12/apps/file-roller/default.nix | 1 - .../gnome-3/3.12/apps/glade/default.nix | 1 - .../gnome-3/3.12/apps/gnome-boxes/default.nix | 1 - .../3.12/apps/gnome-clocks/default.nix | 1 - .../3.12/apps/gnome-documents/default.nix | 1 - .../gnome-3/3.12/apps/gnome-music/default.nix | 2 -- .../3.12/apps/gnome-photos/default.nix | 1 - .../gnome-3/3.12/apps/seahorse/default.nix | 1 - .../gnome-3/3.12/core/baobab/default.nix | 2 -- .../gnome-3/3.12/core/empathy/default.nix | 1 - .../gnome-3/3.12/core/eog/default.nix | 2 -- .../gnome-3/3.12/core/evince/default.nix | 2 -- .../core/gnome-control-center/default.nix | 2 -- .../3.12/core/gnome-disk-utility/default.nix | 1 - .../gnome-icon-theme-symbolic/default.nix | 4 +++- .../3.12/core/gnome-icon-theme/default.nix | 6 +++--- .../3.12/core/gnome-icon-theme/setup-hook.sh | 10 ---------- .../3.12/core/gnome-system-log/default.nix | 1 - .../3.12/core/gnome-user-share/default.nix | 1 - .../gnome-3/3.12/core/totem/default.nix | 2 -- .../gnome-3/3.12/misc/gitg/default.nix | 1 - pkgs/desktops/xfce/applications/ristretto.nix | 2 -- .../development/tools/misc/d-feet/default.nix | 2 -- 27 files changed, 28 insertions(+), 44 deletions(-) create mode 100644 pkgs/data/icons/hicolor-icon-theme/setup-hook.sh delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 223f632f937..629126503c9 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -44,7 +44,6 @@ in stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 1cf29db9dbc..f8eb7bc032e 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; }; + setupHook = ./setup-hook.sh; + meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh new file mode 100644 index 00000000000..05ab9b3d65d --- /dev/null +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -0,0 +1,20 @@ +# Populate XDG_ICON_DIRS +hicolorIconThemeHook() { + + # where to find icon themes + if [ -d "$1/share/icons" ]; then + addToSearchPath XDG_ICON_DIRS $1/share + fi + +} + +envHooks+=(hicolorIconThemeHook) + +# Remove icon cache +hicolorPreFixupPhase() { + rm -f $out/share/icons/hicolor/icon-theme.cache + rm -f $out/share/icons/HighContrast/icon-theme.cache +} + +preFixupPhases="$preFixupPhases hicolorPreFixupPhase" + diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix index c4d609790fa..c4f6741c070 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/bijiben" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix index a761c13e959..deff8494866 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/file-roller" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix index 5979d10fa70..4783804f200 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/glade" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix index cbb53eedd4c..7d33933656a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" done - rm "$out/share/icons/hicolor/icon-theme.cache" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix index 2226f314eed..47bcbf692ad 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-clocks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix index 5c2206641e5..642e0044a75 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index 028ab4832ef..ebcd4c0d01e 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix PYTHONPATH : "$PYTHONPATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix index cc92cdd3014..4d080039a88 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix index fb7339dd05f..02365d6b3d5 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/seahorse" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix index e4da596ae21..4d6c91787a3 100644 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache wrapProgram "$out/bin/baobab" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix index c6ac93b1074..a10450d9332 100644 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix index 8c8a49cb7ed..de30f0dbbe1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index aaef1d59ed9..d1ad071d426 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/evince" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; doCheck = false; # would need pythonPackages.dogTail, which is missing diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 0aed2e7a410..bcb49b6cafe 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done - - rm $out/share/icons/hicolor/icon-theme.cache ''; patches = [ ./search_providers_dir.patch ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix index 56bde211105..a68624ba0e1 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-disks" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix index 6a30362f593..7b9e2097bef 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { make -C src install ''; - buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ]; + buildInputs = [ pkgconfig iconnamingutils gtk ]; + + propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix index aa0c9d24dfe..34a3b67af7e 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "gnome-icon-theme-3.12.0"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; }; - setupHook = ./setup-hook.sh; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + propagatedBuildInputs = [ hicolor_icon_theme ]; + meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh deleted file mode 100644 index d7156f3d463..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -make_gtk_applications_find_icon_themes() { - - # where to find icon themes - if [ -d "$1/share/icons" ]; then - addToSearchPath XDG_ICON_DIRS $1/share - fi - -} - -envHooks+=(make_gtk_applications_find_icon_themes) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix index cdc4b732b97..9abeda53744 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-system-log" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix index 976b0eaca45..fde47a66340 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-user-share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix index 49094751983..9c2db40f89d 100644 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix index 401d5cf2f36..37e1975fd57 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/icons/hicolor/icon-theme.cache rm $out/share/gitg/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index de7fe597594..b38b97b9043 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" ''; - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df5fdbfab5a..5afe5525d0e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { From 0a97e2153e0546b47b39149f245f2a7c0e384f2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 19:42:02 +0100 Subject: [PATCH 127/174] haskell-generic-builder.nix: don't add lib64 directories to the search path Packages that provide 32 and 64-bit libraries in the same store path are rare and usually require manual overrides anyway. It seems pointless to try and guess proper settings for them. The effect is that we'll end up with bogus settings that take more effort to correct that it takes to configure proper settings in the first place. Point in case: haskell-cuda and it's configuration for "cudatools". Fixes https://github.com/NixOS/nixpkgs/issues/6564. --- pkgs/development/haskell-modules/generic-builder.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7d5a9dd5903..f1495422edb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -147,11 +147,9 @@ stdenv.mkDerivation ({ if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi - for d in lib{,64}; do - if [ -d "$p/$d" ]; then - configureFlags+=" --extra-lib-dirs=$p/$d" - fi - done + if [ -d "$p/lib" ]; then + configureFlags+=" --extra-lib-dirs=$p/lib" + fi done ghc-pkg --${packageDbFlag}="$packageConfDir" recache From 3e9e1a2f4e70a09445da2f9ad0227dc66185d2c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 19:49:39 +0100 Subject: [PATCH 128/174] haskell-generic-builder: set LOCALE_ARCHIVE only on Linux --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f1495422edb..73851786f83 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation ({ propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment @@ -298,4 +297,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) From c7764773502a239b42a119cd2df38be14a8829ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 20:15:26 +0100 Subject: [PATCH 129/174] haskell-generic-builder: update and jailbreak cabal files before patchPhase is run The updated and jailbroken Cabal file must be in place before the 'patchPhase' hook is run, otherwise we cannot use that hook to patch the Cabal file! Resolves https://github.com/NixOS/nixpkgs/issues/5922. As an added bonus, this change makes the "jailbreakPhase" obsolete. --- .../haskell-modules/generic-builder.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 73851786f83..faf1ce4046e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; prePhases = ["setupCompilerEnvironmentPhase"]; - preConfigurePhases = ["jailbreakPhase" "compileBuildDriverPhase"]; + preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; inherit src; @@ -121,6 +121,14 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. + prePatch = optionalString (editedCabalFile != null) '' + echo "Replacing Cabal file with edited version ${newCabalFile}." + cp ${newCabalFile} ${pname}.cabal + '' + optionalString jailbreak '' + echo "Running jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + '' + prePatch; + setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment @@ -155,20 +163,6 @@ stdenv.mkDerivation ({ runHook postSetupCompilerEnvironment ''; - jailbreakPhase = '' - runHook preJailbreak - - ${optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." - cp ${newCabalFile} ${pname}.cabal - ''}${optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." - ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal - ''} - - runHook postJailbreak - ''; - compileBuildDriverPhase = '' runHook preCompileBuildDriver @@ -283,7 +277,6 @@ stdenv.mkDerivation ({ // optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } From 2af0227154ce1f820dd0d83edb3c24482f4fbfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Feb 2015 20:48:26 +0100 Subject: [PATCH 130/174] gtk2: small maintenance update --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index b95de7105be..c4dec6c2e1e 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.25"; + name = "gtk+-2.24.26"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3"; + sha256 = "d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133"; }; enableParallelBuilding = true; From 6c20e1d0bd29af93e93047de8e6042dc2f79bd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:06:06 +0100 Subject: [PATCH 131/174] xf86-video-vmware: drop patch included in update --- pkgs/servers/x11/xorg/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3701bdc461f..bb3be6e8b51 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -221,11 +221,6 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker - patches = [( args.fetchpatch { - url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" - + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; - sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; - })]; }; xf86videoqxl = attrs: attrs // { From c4f238c39c1ce09fea82e6095a405d22ab874348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:14:45 +0100 Subject: [PATCH 132/174] glib: maintenance update --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1dff672b348..4749e2394b5 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.42"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "16pqvikrps1fvwwqvk0qi4a13mfg7gw6w5qfhk7bhi8f51jhhgwg"; + sha256 = "1nz7vb549gzkxcpmb7yj9dvg3k8kwwz2kr1aykysj46k5fyixk53"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; From 947d78c9e82a3f22cef048285103f632eaace7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:24:09 +0100 Subject: [PATCH 133/174] trustedGrub: fix build by using older automake (again) --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27fc19fac35..49c20ea4e72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1475,6 +1475,7 @@ let trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + automake = automake112x; # fails with 13 and 14 }; grub2 = grub2_full; From 943754c5d0f9a7fa645e5f4b3ffe63de379097da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:31:41 +0100 Subject: [PATCH 134/174] harfbuzz: small update --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 0b75797b366..a7ec3a75878 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.37"; + name = "harfbuzz-0.9.38"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "01q22an29ni6b7yaial7l2zq0yyr8dk2230x7n31dbfy88w3npr5"; + sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; }; configureFlags = [ From 97feb65c00441a645c080c9e98a165dd84f5c43a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 16:01:10 +0100 Subject: [PATCH 135/174] pcsctools: fix evaluation --- pkgs/tools/security/pcsctools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index a72556447cd..72e43f15fe6 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools used to test a PC/SC driver, card or reader"; homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; - license = licenses.gpl2plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = with platforms; linux; }; From 3f7de179f56336f0a47013b0703e74d25c86b8e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 15:55:17 +0100 Subject: [PATCH 136/174] R: update to version 3.1.3 --- pkgs/applications/science/math/R/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 05f18334b99..0bd6f5a35c3 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.1.2"; + name = "R-3.1.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw"; + sha256 = "04kk6wd55bi0f0qsp98ckjxh95q2990vkgq4j83kiajvjciq7s87"; }; buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt @@ -54,8 +54,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; - # The test suite fails when building without the recommended packages. - doCheck = withRecommendedPackages; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c20ea4e72..d02a677b1ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7925,14 +7925,14 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; - withRecommendedPackages = true; + withRecommendedPackages = false; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { - # Those packages are usually installed as part of the R build. - recommendedPackages = with rPackages; [ boot class cluster codetools - foreign KernSmooth lattice MASS Matrix mgcv nlme nnet rpart - spatial survival ]; + recommendedPackages = with rPackages; [ + boot class cluster codetools foreign KernSmooth lattice MASS + Matrix mgcv nlme nnet rpart spatial survival + ]; # Override this attribute to register additional libraries. packages = []; }; From a591dbac3b91c9cb21d85f3859d0b27d9e13636c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 16:31:54 +0100 Subject: [PATCH 137/174] r-modules: update from CRAN state at 2015-03-09T16:32:24+0100 --- pkgs/development/r-modules/cran-packages.nix | 407 ++++++++++--------- 1 file changed, 218 insertions(+), 189 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index d8db5b41696..1084ee65724 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -87,7 +87,7 @@ BAMMtools = derive { name="BAMMtools"; version="2.0.2"; sha256="10z638f79j3jksb6 BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; }; BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; }; BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; -BAT = derive { name="BAT"; version="1.2"; sha256="06r2y9l07kj3fm3mm38xjrl7q6yz66vr514xx37957r9s8zf7i92"; depends=[vegan spatstat nls2]; }; +BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; }; BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; }; BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; BBEST = derive { name="BBEST"; version="0.1-2"; sha256="1zfnd379xgj29g8cld19w8ali1ny30l1q7ca47ykf07myj62ckv0"; depends=[DEoptim aws ggplot2 reshape2 shiny]; }; @@ -100,7 +100,7 @@ BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mh BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive { name="BCEA"; version="2.1-0"; sha256="120xmgd7ipnrbiyh8h7z80i0bw9iv9rjf8nnb3f988h9bx8xiwp4"; depends=[]; }; BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; }; -BDgraph = derive { name="BDgraph"; version="2.15"; sha256="1vsdj0lwl13cjhcmfpvzqfqhvcmv6d1rb7vibkxi6qbixdwwxclg"; depends=[Matrix igraph]; }; +BDgraph = derive { name="BDgraph"; version="2.16"; sha256="0vwygz464wbawamjnkclp9kqlb42s993fc0kp6aql413dhsqmg74"; depends=[Matrix igraph]; }; BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; }; BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; }; @@ -124,6 +124,7 @@ BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83 BNPTSclust = derive { name="BNPTSclust"; version="1.0"; sha256="04qryrhbhi4qfp9rckw3x0g3292lyfrvphcwgb1p5ig661pxgg7p"; depends=[mvtnorm MASS]; }; BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; }; BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; }; +BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; }; BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; }; BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; }; BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; @@ -158,7 +159,7 @@ BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2 BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; }; BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; }; -BayesSummaryStatLM = derive { name="BayesSummaryStatLM"; version="1.0"; sha256="1gm89xk07rnwxiw5cvqqsi1p6c96j9slrp129vpy2pff56gand70"; depends=[mvnfast ff]; }; +BayesSummaryStatLM = derive { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[mvnfast ff]; }; BayesTree = derive { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; }; BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; BayesVarSel = derive { name="BayesVarSel"; version="1.6.1"; sha256="1pmhbyvsq4k2kqnbnxm089qxil0ac61msa204pck6r0b360pmpnh"; depends=[MASS]; }; @@ -178,12 +179,13 @@ BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139s Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; }; Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; -BiSEp = derive { name="BiSEp"; version="2.0"; sha256="1nm76bcdwwy8c434a94rnhfvnc3va54q0jd8blkbh79qm5nwcpf9"; depends=[mclust]; }; +BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[mclust]; }; BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; }; BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; }; -BinNonNor = derive { name="BinNonNor"; version="1.1"; sha256="035xarfsbi7908aipzymxwgyl6x1arrgl17frzc0bzgy36hfkd6m"; depends=[BB corpcor mvtnorm Matrix]; }; +BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor mvtnorm Matrix]; }; BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; }; BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; }; +Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; }; BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; }; BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; }; BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; }; @@ -211,10 +213,11 @@ Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvm BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; }; -C50 = derive { name="C50"; version="0.1.0-21"; sha256="1hwkzf4ravf75cx5xrikh3pfsfjm2ri8qqjbhyyz1ysi0vg4jhji"; depends=[]; }; +C50 = derive { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; }; CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; }; CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; }; CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; }; +CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet mboost Matrix mgcv]; }; CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; }; CARBayes = derive { name="CARBayes"; version="4.0"; sha256="1v5pl1hfmmmlcnl324g45playkki20n33w4p5g536260kva74zly"; depends=[MASS Rcpp truncdist spam coda sp Rcpp]; }; CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; }; @@ -236,6 +239,7 @@ CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5 CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; }; CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; }; CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; }; +CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; }; CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; }; CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; @@ -253,7 +257,7 @@ CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; }; CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; -CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; }; +CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mixdist mclust survival]; }; CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; }; CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -294,7 +298,7 @@ CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256=" CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; }; CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; -ChainLadder = derive { name="ChainLadder"; version="0.1.9"; sha256="1ysx4g16v75jn2727i56shkfbyyr08vfyngfpapc644xkf69nlq5"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; }; +ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[systemfit statmod Matrix actuar Hmisc reshape2 MASS lattice tweedie]; }; ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive { name="ChemoSpec"; version="3.0-1"; sha256="1c8ark711hy4a48pvn8n6c76ibxz8dbpymh3vykpx85a2csjzslv"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation clusterCrit speaq]; }; @@ -330,6 +334,7 @@ CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid3 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; }; Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp Rcpp]; }; +Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; }; @@ -345,7 +350,7 @@ CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; }; CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; }; CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; }; -CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; }; +CoxRidge = derive { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; }; Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; }; @@ -360,7 +365,7 @@ DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5 DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; }; DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; }; DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; }; -DAMOCLES = derive { name="DAMOCLES"; version="1.0"; sha256="1zk9r17f0nf3w78iwglw3hfz750pnjrd9p1d29bgh31zpc1714wi"; depends=[geiger caper ape deSolve matrixStats]; }; +DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[geiger caper ape deSolve matrixStats expm picante]; }; DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; }; DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; }; DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; }; @@ -396,7 +401,7 @@ DPw = derive { name="DPw"; version="1.1.3"; sha256="1cw9qig5z2nfp2b3k4ng5hpar9iz DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; }; DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; }; -DSsim = derive { name="DSsim"; version="1.0.2"; sha256="1dydglwgmzn3916kxngrc6wshdk9gvxm3rxqi6if63ljrb8yarnj"; depends=[shapefiles splancs mrds mgcv]; }; +DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[shapefiles splancs mrds mgcv]; }; DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; }; DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; @@ -421,7 +426,7 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; }; -Deriv = derive { name="Deriv"; version="2.0"; sha256="0yshw6fssbnj5mvx2k42iqfz62s49d3056xdwwhamsbmpqdxmzxj"; depends=[]; }; +Deriv = derive { name="Deriv"; version="3.0"; sha256="025410mhhk085z2in30s765imgzs9rwp8ki1kgdfvyi2bcp6y2v3"; depends=[]; }; DescTools = derive { name="DescTools"; version="0.99.9"; sha256="19zz8jnhs87klzh6c6kxaq34kacfb80zrm54qywkj9627gv4ngn6"; depends=[boot mvtnorm]; }; DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; }; DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; }; @@ -547,8 +552,7 @@ ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084s ExomeDepth = derive { name="ExomeDepth"; version="1.1.4"; sha256="0a4y6y1zi1jn1g14f3wsl2pfbmp58afwkvrk7x7s1wp16vwgq0xb"; depends=[aod VGAM]; }; ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; -ExtDist = derive { name="ExtDist"; version="0.3.7"; sha256="0vcckw94j02qcy298p26f2v9jrw3a0j62r4xb0cg11cj5aysqw3q"; depends=[numDeriv optimx VGAM SuppDists truncdist]; }; -ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.4.2"; sha256="0gkrip4gv7xmar323p95696r3zpmv6ick6fl33x0jc2ldzi0wrbj"; depends=[Formula]; }; +ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; }; FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; }; FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; }; FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; }; @@ -605,23 +609,23 @@ FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4k FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; }; FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; }; -FeaLect = derive { name="FeaLect"; version="1.7"; sha256="1v4psr2j74ciyi7jxphx70hjrd47l5krwvp26ml8qsd51q1i37l8"; depends=[lars rms]; }; +FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; }; FeatureHashing = derive { name="FeatureHashing"; version="0.8"; sha256="05300709d4k5fxyajvdjhwy7br558g81agfrp9pqa2y0v0qx2zkw"; depends=[Rcpp Matrix digest Rcpp digest BH]; }; FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; }; FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; }; -FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; }; +FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; }; FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; }; +FinCovRegularization = derive { name="FinCovRegularization"; version="1.0.0"; sha256="0da7asm4mvbd4wvqll5gdvckb10ccfx7gy141xbxyaixdhgi6zl4"; depends=[quadprog]; }; FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; }; FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod zoo xts TTR]; }; FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; -FindIt = derive { name="FindIt"; version="0.4"; sha256="1srqxg9y2yzv7nfspriziyxxp3j6j143g2z9dg6rcf643k8pqqa3"; depends=[glmnet lars Matrix]; }; +FindIt = derive { name="FindIt"; version="0.5"; sha256="0bj4al4b7na3w5y783nqyd2wc1pmwfmgf2p4q6n7vqbzqghy0a3q"; depends=[glmnet lars Matrix]; }; FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo Rcpp RcppArmadillo]; }; FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; }; FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; }; FitARMA = derive { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; }; -FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lxs9c2bbh2i2gv1bv2sy8gq6k6p0jpl1d3axqd1xk5pipm2x"; depends=[nlme]; }; FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; }; Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; @@ -635,13 +639,13 @@ FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v9 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; }; FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; }; -FunChisq = derive { name="FunChisq"; version="2.0.1"; sha256="0ix3dqxckcn112imnasz8hx5xcshmg304178ickpznl766kmx5gi"; depends=[Rcpp BH Rcpp RcppClassic]; }; +FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[Rcpp BH Rcpp RcppClassic]; }; FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; }; FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; }; Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp Rcpp RcppEigen]; }; FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; }; FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; -FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.3-5"; sha256="0saqmx9vryjd8sgja54vzq3a4czg39j36zmlrnz2v612q8lcy1v2"; depends=[]; }; +FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; }; FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; }; G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; }; @@ -676,7 +680,7 @@ GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7 GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; }; GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools sp RColorBrewer MASS rgeos]; }; GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; }; -GLDreg = derive { name="GLDreg"; version="1.0.1"; sha256="1lbv5h8bnb3mi66as2vq1xyzh7z7vm1ils2jf24gn0xnprl02nvq"; depends=[GLDEX MASS quantreg]; }; +GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; }; GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; }; GMCM = derive { name="GMCM"; version="1.1.1"; sha256="181in94mdc6fka0l4a6vc84n295pgsv18yf5mgf59qfmz8vjxi4n"; depends=[Rcpp Rcpp RcppArmadillo]; }; GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; }; @@ -713,10 +717,12 @@ GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39 GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; }; GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; }; GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; +GameTheory = derive { name="GameTheory"; version="1.0"; sha256="07v2qhnhczid814isnz4ywf624sds6jxxzayl8mzlnjv5qnk59z8"; depends=[lpSolveAPI combinat gtools ineq kappalab]; }; Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; }; GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; }; GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; }; GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; +GenForImp = derive { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive { name="GenOrd"; version="1.2.0"; sha256="1aypz879r2fc8zd7lnd1d2ic3zgx9gpz4gxmfqyhb5gfkg50xhlg"; depends=[mvtnorm Matrix MASS]; }; GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; }; @@ -735,14 +741,14 @@ GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd8 GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; }; GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; }; GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; -GetoptLong = derive { name="GetoptLong"; version="0.0.9"; sha256="0gmhjd19vqd1jc9bj09715j33c5axrza2nw3w5kqgkh42qw4rsmh"; depends=[rjson GlobalOptions]; }; +GetoptLong = derive { name="GetoptLong"; version="0.1.0"; sha256="1r86bffsj6s8d71wngspqvfv0gyrrpihf225b4v3c69c05n36qm1"; depends=[rjson GlobalOptions]; }; GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; }; GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; }; Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; }; GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; }; -Gmisc = derive { name="Gmisc"; version="1.0"; sha256="0i92f9v9h4d7vxzzgafwhy8bwf52djqb3mxsaqqz2in68fdywdqq"; depends=[htmlTable lattice sp Hmisc forestplot]; }; +Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[Rcpp htmlTable lattice Hmisc forestplot abind knitr magrittr Rcpp]; }; GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; }; GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; }; GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; }; @@ -797,8 +803,8 @@ Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbc HapEstXXR = derive { name="HapEstXXR"; version="0.1-7"; sha256="1jarb0465yymb08r8dr0mn6qlwbf0y0c4ipvxvcfwlvqalbp2kd6"; depends=[survival]; }; Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; }; HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; -HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.4"; sha256="0098n5m3svcc3z5cvmqygazlvm1dzd4zfbpj1q9zqs5wr3407wcv"; depends=[mice]; }; -HiClimR = derive { name="HiClimR"; version="1.1.5"; sha256="1kzlp2plprrsqidfikiri0bvj67m3lfy3ansrx1vi9b5ji6lf9n8"; depends=[]; }; +HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; }; +HiClimR = derive { name="HiClimR"; version="1.1.6"; sha256="0x63vh8sk5a37dal5s6j8pkxxym8f8f0cjjinriys5pi8iq6yfmr"; depends=[]; }; HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive { name="HiDimDA"; version="0.2-2"; sha256="0y45c7yi20ixr7d8zmjsbxsc9kvvwpdw49qncpz5l5wmdmzhy8mm"; depends=[]; }; HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; }; @@ -871,13 +877,13 @@ Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6 InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.1-4"; sha256="01yjkqj1k7haa75avcqhkxjm6569c2ds8fydz3spcmx37l2xafdp"; depends=[glmnet mboost]; }; InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; }; -IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr Rcpp]; }; +IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; }; Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; }; IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; }; IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; }; JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; }; -JAGUAR = derive { name="JAGUAR"; version="1.1"; sha256="0iy91hx4rcsx84kazkmq0jnl6gqnc1cmbkb957y0v2zr9adpqs4y"; depends=[Rcpp plyr lme4 doParallel Rcpp]; }; +JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[Rcpp plyr lme4 doParallel Rcpp]; }; JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; }; JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; @@ -900,6 +906,7 @@ KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kaj KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[e1071 plsgenomics class]; }; +KOGMWU = derive { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; }; KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; }; KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; }; @@ -938,6 +945,7 @@ LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4c LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; }; LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-4"; sha256="13hbwg05p48i2gg9i379msb78k35m6kqj8l29cmrpqm1gcdyh3sg"; depends=[RColorBrewer]; }; +LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; }; LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; }; LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; }; @@ -958,7 +966,7 @@ Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14d LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; }; LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; -LeafArea = derive { name="LeafArea"; version="0.0.5"; sha256="1fjb4mcp09xfsgv5ppza4hnhswb5z0qrjmhhpi4sfxlsl3nb4his"; depends=[]; }; +LeafArea = derive { name="LeafArea"; version="0.0.6"; sha256="0n5znjxs1ixnlzx248jkhjpglzvb3wzxaqng9vi02smwlwaszvwn"; depends=[]; }; LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; }; LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; }; @@ -983,7 +991,7 @@ MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; }; MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; }; MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; }; -MAMS = derive { name="MAMS"; version="0.3"; sha256="17d75phlxi9267dwpzmnzpk01l69xvcdqjjabj0ai7j2l6llp2n9"; depends=[mvtnorm]; }; +MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; }; MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; }; MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; }; MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; @@ -1029,7 +1037,6 @@ MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949r MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; }; MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[fda_usc deldir depth depthTools matrixStats]; }; MGL = derive { name="MGL"; version="1.1"; sha256="17xkrq0wzq1gfa6k1lgf34l4ibwjk6j9rnig3l403zpykmf2ffs6"; depends=[]; }; -MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6rlb99y9z68935q8px70njs8rl87"; depends=[ggplot2 plyr reshape2]; }; MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; }; MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; @@ -1098,7 +1105,7 @@ Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3q MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; }; MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; -MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.1"; sha256="02xpngva5y2xk2c6kac80qc3z7s906gs3s22r2p992kyl6v4hms3"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; +MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.2"; sha256="0cwqcxkcily3wdg756s9i9brcrhp8pz4q9gkmqfsi6i0l4rkk7fi"; depends=[dplyr rgdal rgeos rvest sp stringr]; }; McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; }; McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; }; @@ -1118,12 +1125,12 @@ MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1r MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; }; Metatron = derive { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 mpt Matrix]; }; Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; }; -MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; depends=[nlme]; }; +MethComp = derive { name="MethComp"; version="1.22.1"; sha256="0p4ikf3mgd2syk9rsp6v1kd4vhg3h43krw8mhl3771shrh9bnivb"; depends=[nlme]; }; Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; }; MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; }; MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; -MicSim = derive { name="MicSim"; version="1.0.6"; sha256="01w9x3ld8b64m3d9qjbja6gbmgnsj2bna9l7lisa17add0i11744"; depends=[chron snowfall rlecuyer]; }; +MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron snowfall rlecuyer]; }; MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; }; MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; }; @@ -1132,7 +1139,7 @@ Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0 MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; }; MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; }; MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; -MixGHD = derive { name="MixGHD"; version="1.3"; sha256="1fqy0ismqzg6g4x1m82kabywfg0jnmh397py0jra2ck3gr0wizsf"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; }; +MixGHD = derive { name="MixGHD"; version="1.4"; sha256="0c7d9yf4hl7s8a1alzxjs12kcq98s9wna277vw20rnxa60b6dsqm"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; }; MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; }; MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; }; MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; }; @@ -1149,7 +1156,6 @@ MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4 MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[svcm lattice]; }; MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; }; Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; }; -MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; }; MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05qjmzv80bkp3ib45x7i05s2mqy1yxn"; depends=[]; }; MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; @@ -1166,7 +1172,7 @@ Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws7 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; }; NAM = derive { name="NAM"; version="1.0.2.2"; sha256="1p2c95fiv1mb5ja3l6d8scnvlbmiwwgbln24z7nqwpmskc5d6dbd"; depends=[Rcpp Matrix missForest Rcpp]; }; -NAPPA = derive { name="NAPPA"; version="2.0"; sha256="18yipic8xkf13jaaxnn388m49r5q2g7q7gb0mmw3gh7226lmz987"; depends=[plyr NanoStringNorm]; }; +NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; }; NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; }; NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; }; @@ -1199,9 +1205,10 @@ NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; }; NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; }; NSM3 = derive { name="NSM3"; version="1.1"; sha256="0xyx06pc9690akdm02597pgcchn29gvc4kzcgyc3ihsjj71xryi2"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; }; +NSUM = derive { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; }; NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; }; -NbClust = derive { name="NbClust"; version="2.0.3"; sha256="1wphzfb63j85na2l8plc02wmkpvzwi8wp8q8i04jf1n265fa378l"; depends=[]; }; +NbClust = derive { name="NbClust"; version="2.0.4"; sha256="01r76gfg1lyajkh5x18pcqzp8iw0g3kfq5q8liv351l9wgykj34g"; depends=[]; }; NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; }; NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; @@ -1210,13 +1217,13 @@ NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwva NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; }; NeuralNetTools = derive { name="NeuralNetTools"; version="1.0.1"; sha256="1gxlv595jxbvpis1vp1bxkspwhqk32f0d0lhkzah8d5ijjzdqihf"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; }; -Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; }; +Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; }; NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; }; NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; }; NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; }; NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; }; -NormPsy = derive { name="NormPsy"; version="1.0.2"; sha256="0vkk282kiqvfx2qvan8yifpngrx3slyjqr2dwqr5h5k5snb6b0vq"; depends=[lcmm]; }; +NormPsy = derive { name="NormPsy"; version="1.0.3"; sha256="0lp6b7hh36ipmsv395xk671f7sczlfz5f9x0h88b2q6zvgbk081v"; depends=[lcmm]; }; NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; }; NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; }; Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; @@ -1236,9 +1243,9 @@ ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; -OUwie = derive { name="OUwie"; version="1.44"; sha256="1flqcbmrzlfdw4ak2q2rjkzxi4bb22kzipcx2w6a5z07b06xhqz9"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; }; +OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; }; Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; -OceanView = derive { name="OceanView"; version="1.0.2"; sha256="188hviv2dqvc1d7aki3a80naiy31lq27d8cc755mq4qdqq833l4d"; depends=[plot3D plot3Drgl rgl shape]; }; +OceanView = derive { name="OceanView"; version="1.0.3"; sha256="0k281r358xg599n3h4avwbhnhgcfdawf36p8k3sxwv29292npkzv"; depends=[plot3D plot3Drgl rgl shape]; }; Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; }; OjaNP = derive { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; }; OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; @@ -1288,7 +1295,7 @@ PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; }; PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; }; PCovR = derive { name="PCovR"; version="2.5"; sha256="1as3qd2gqznfy95mil8k31nkqrf36sgpja5s9zdwvk0vpaxv1fr7"; depends=[GPArotation ThreeWay MASS Matrix]; }; -PDQutils = derive { name="PDQutils"; version="0.1.0"; sha256="0s6k58l2rrgymg3l4b8s9rvnqlrhcm2pvsrr3gc2x2f846g7pxny"; depends=[orthopolynom moments]; }; +PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; }; PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; }; PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; @@ -1317,12 +1324,12 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; depends=[]; }; PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; }; PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; -PRISMA = derive { name="PRISMA"; version="0.2-2"; sha256="0r4dhnp0f6q43iklmwjim20hy9wjijkh8q4gljx8sph47njc0xqd"; depends=[Matrix gplots ggplot2]; }; +PRISMA = derive { name="PRISMA"; version="0.2-3"; sha256="0fzisdr08r8dvdjlljsspvc0sqcnn8cqlb75lkccw0dfkc43snpg"; depends=[Matrix gplots ggplot2]; }; PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; }; PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; -PRROC = derive { name="PRROC"; version="1.0"; sha256="0md8mbbld0y0p2y9crz3np5pj5b7z3a4j7ixz2jn9gld28bydgk0"; depends=[]; }; +PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; }; PReMiuM = derive { name="PReMiuM"; version="3.0.32"; sha256="03hs56vhl2xxxy2mza6cp0zivr1p596x5jj4y8f63jy0mygk62x8"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; }; -PResiduals = derive { name="PResiduals"; version="0.2-0"; sha256="0bjn600wq8h11spi20q3gdv9ajrvagjyw6a8pfmm3pvangasq2nl"; depends=[Formula rms sandwich actuar]; }; +PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[MASS Formula rms sandwich actuar]; }; PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; }; PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; }; @@ -1360,8 +1367,10 @@ PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1a PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; }; PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; }; PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; +PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; }; -PoisBinOrd = derive { name="PoisBinOrd"; version="1.0"; sha256="0jzn0knw61hrazl9xrbqis4j6kj4ipd077vkv6fadpcwxhhi2p2m"; depends=[corpcor GenOrd Matrix mvtnorm]; }; +PoisBinNonNor = derive { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; }; +PoisBinOrd = derive { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; }; PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; }; PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; @@ -1422,9 +1431,9 @@ R_filesets = derive { name="R.filesets"; version="2.7.0"; sha256="12aghswi40qr6n R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; }; R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; }; -R_oo = derive { name="R.oo"; version="1.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; }; +R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; }; R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; }; -R_utils = derive { name="R.utils"; version="1.34.0"; sha256="1brpj67px14d1y5ax3j49sbf7dnnj1rcbhli5ph44y65snrmdaih"; depends=[R_oo R_methodsS3]; }; +R_utils = derive { name="R.utils"; version="2.0.0"; sha256="1ldrz6nj45mnggk1zsx8j479kzfi2pjp402zid5yrnqmh50q61sb"; depends=[R_oo R_methodsS3]; }; R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; }; R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; }; R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; }; @@ -1432,12 +1441,13 @@ R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz6 R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; }; +R2MLwiN = derive { name="R2MLwiN"; version="0.8-0"; sha256="1fjns3v6prjkd4iwdcj846sj5ji1bg4b7axxx18wlsvrin83gd9k"; depends=[lattice coda Matrix foreign rbugs digest]; }; R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; }; R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; }; -R2SWF = derive { name="R2SWF"; version="0.8-2"; sha256="1lyhzz2gpa3l7ljkdxfdx5s0g87jvgz2h9awgapkjsm6gxy922n2"; depends=[sysfonts]; }; +R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; }; R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; }; R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; }; -R2jags = derive { name="R2jags"; version="0.05-01"; sha256="0lswadb5n2x7afz5b634cc1xkj60hykhibqq488sgcm80r1xx278"; depends=[rjags abind coda R2WinBUGS]; }; +R2jags = derive { name="R2jags"; version="0.05-03"; sha256="02r68g005cmcc7dg1a52awdyak2sg2pszpl6ckw4bw19sk9nnd48"; depends=[rjags abind coda R2WinBUGS]; }; R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; }; R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; }; R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; }; @@ -1482,6 +1492,7 @@ REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fz REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; }; REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; }; +RESS = derive { name="RESS"; version="1.0"; sha256="0p6zfvakq4c02qp26l8zqcmi95na408rv6j6ibaxbcyf5vq9rhcs"; depends=[]; }; REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; }; RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; @@ -1507,7 +1518,7 @@ RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; }; RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; }; -RISmed = derive { name="RISmed"; version="2.1.4"; sha256="1gsy55g3mw5qkam1nswy851dw8gqf4miqzczm75np8chmlczy3b2"; depends=[]; }; +RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; }; RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; }; RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; }; RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; @@ -1544,7 +1555,7 @@ ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxh ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; }; ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; }; ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; -RODBC = derive { name="RODBC"; version="1.3-10"; sha256="0rvizr285g0hcsyjbvc2038f0mmw2cg6iwvgb3igkb5z92059iqc"; depends=[]; }; +RODBC = derive { name="RODBC"; version="1.3-11"; sha256="1j6qv7w4klgwzdx9jf6h4l1x1idn3rka70ql37pbnzga1h5dr9yy"; depends=[]; }; RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; }; RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; }; @@ -1552,7 +1563,7 @@ ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; }; ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; }; ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; -RObsDat = derive { name="RObsDat"; version="14.12"; sha256="1b8yfp8n1ky1vmr2w2ghfpha9n7gc6x6v1kaf9llrhb6spx2w18i"; depends=[zoo spacetime xts DBI vwr e1071 sp]; }; +RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[zoo spacetime xts DBI vwr e1071 sp]; }; ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; }; ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx RandVar evd]; }; ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; }; @@ -1634,7 +1645,6 @@ RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybk Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; }; Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; }; Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; -Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; }; Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; }; @@ -1642,7 +1652,7 @@ Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv1 RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; }; RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[Rcmdr BCA flexclust car RcmdrMisc nnet foreign rpart rpart_plot]; }; RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; }; -RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-1"; sha256="0fn12acbjh0n402hn9whhhyij3jlwmvlawyfi9myimnb4wyaqgwb"; depends=[R2HTML abind ez nortest reshape Rcmdr]; }; +RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[R2HTML abind ez nortest reshape Rcmdr RcmdrMisc]; }; RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[Rcmdr epiR abind]; }; RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.27"; sha256="00yk41f8d7z602xb3hpkk0zr2r17d9ap6sx78ni8wl7rkvmn0c7r"; depends=[Rcmdr]; }; RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; }; @@ -1654,7 +1664,7 @@ RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; }; RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.1"; sha256="1xc7vfir941v65awq2glawbcwq28s5h73ffh41hb5aaazaism1m5"; depends=[mixlm MASS pls xtable Rcmdr]; }; RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; }; -RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-17"; sha256="0asqvl99x03irnidjs72m6x4x3v8xlaikhfk0zk85v0l21lgy4iv"; depends=[Rcmdr pROC ROCR ResourceSelection]; }; +RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[Rcmdr ROCR pROC ResourceSelection]; }; RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; }; RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; }; RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; }; @@ -1677,25 +1687,25 @@ RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9j RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[survival date Rcmdr]; }; RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; }; -Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; }; +Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; }; Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; }; -Rcpp = derive { name="Rcpp"; version="0.11.4"; sha256="0ar50r6cbvbd0crc47cm34lnrmzfzzv5fmhd2qa60br55rpxbhf6"; depends=[]; }; +Rcpp = derive { name="Rcpp"; version="0.11.5"; sha256="0vmdprnf2i0hvy4pz5v0zdvwgyfv1kgmiwdgjjxppz5p84n59xs9"; depends=[]; }; Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; }; RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; }; -RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.4.0"; sha256="0qd20bs0h5kvk0433hhslm4qzddchv8vnaynvnzicjjwq3adgi2g"; depends=[Rcpp Rcpp]; }; +RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.650.1.1"; sha256="1i11nnkbzhk0sckj29fza32g45jkkjh11yx4q78byhawpr8s30jq"; depends=[Rcpp Rcpp]; }; RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; }; RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; }; RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic Rcpp RcppClassic]; }; RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; }; -RcppEigen = derive { name="RcppEigen"; version="0.3.2.3.0"; sha256="16n5zkjnf1vipicx7fsr278p99agdbxgg3gjz9xq205frm9cx25a"; depends=[Matrix Rcpp Rcpp]; }; +RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp Rcpp]; }; RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; }; RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; }; RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; }; -RcppParallel = derive { name="RcppParallel"; version="4.3.3"; sha256="1xsp44jfynvz6flfajgbf82aykdhz242brmwxw9w67ngx96x0dxv"; depends=[]; }; +RcppParallel = derive { name="RcppParallel"; version="4.3.4"; sha256="05qqp64ci499qnd121a3hz8fwirw01p4rwldw9saq3v3pfkw2fam"; depends=[]; }; RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; }; RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; }; RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; }; @@ -1726,7 +1736,7 @@ RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhgh Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; }; ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; }; RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; -ReporteRs = derive { name="ReporteRs"; version="0.7.2"; sha256="0lcxyj0dgm5l4pjsx9whbszzsn3zk7s4jjqbkrgb5b6rvxw1s29s"; depends=[ReporteRsjars rJava]; }; +ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m2653xfcl4d6zs010hzcjxr6sk26dhxj11alqgr"; depends=[ReporteRsjars rJava]; }; ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; }; ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; }; ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; }; @@ -1757,7 +1767,7 @@ RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256 RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; }; RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; }; RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; }; -RobPer = derive { name="RobPer"; version="1.2"; sha256="1623cbza624r4f4v5z9f7gr7bvwy4qysrksizw5zpgj75xzq7ici"; depends=[robustbase quantreg BB rgenoud]; }; +RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[robustbase quantreg BB rgenoud]; }; RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; RobustAFT = derive { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; }; @@ -1779,7 +1789,7 @@ Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5 RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; }; Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcpinsyyanfrqjdskrpk7z70fnyvwqm2"; depends=[truncnorm]; }; Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; }; -Rssa = derive { name="Rssa"; version="0.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; }; +Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[svd forecast lattice]; }; Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; }; Rsymphony = derive { name="Rsymphony"; version="0.1-19"; sha256="0m9xbyp4hxz9rbc8nd7q0fwzgl6126iv0sxwifamxkc9z8vr86js"; depends=[]; }; Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; }; @@ -1818,6 +1828,7 @@ SCRT = derive { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jh SCVA = derive { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; depends=[]; }; SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc sm tseries rpanel rgl]; }; +SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[igraph doParallel foreach iterators]; }; SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; }; @@ -1830,11 +1841,12 @@ SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kv SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; SETPath = derive { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; }; SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; -SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; }; +SGCS = derive { name="SGCS"; version="2.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9rjbprlwf3h409dj59g6k2zx6"; depends=[spatstat]; }; SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; }; SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; }; SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; +SID = derive { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[pcalg igraph Matrix]; }; SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[survival MASS glmnet]; }; SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; @@ -1933,7 +1945,7 @@ Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70 SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mvtnorm multcomp mratios]; }; SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9srzsa0g6p3jlzplpsrprbg11kv6fsbbh47pz02fvi8mc"; depends=[evd]; }; SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; }; -SimSeq = derive { name="SimSeq"; version="1.2.0"; sha256="0jbi19bdsvyrmr2762p8skw419qx438vgnjb93xdy90lrgyx11wh"; depends=[fdrtool]; }; +SimSeq = derive { name="SimSeq"; version="1.3.0"; sha256="0xkiiwk52sv8vivd4qsvzgjbw8q0csy0d45diym2mc9aq9nhf5dq"; depends=[fdrtool]; }; SimilarityMeasures = derive { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; Simile = derive { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; @@ -2002,6 +2014,7 @@ SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; }; SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; }; Surrogate = derive { name="Surrogate"; version="0.1-4"; sha256="0wvicdd7lxczxv4hdbdn8cnv5k36biix65r4byn4cpgqhkyy78k6"; depends=[MASS nlme msm lme4]; }; +SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; }; SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; }; SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; }; Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; @@ -2035,7 +2048,7 @@ TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; }; TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; }; TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; }; -TR8 = derive { name="TR8"; version="0.9.11"; sha256="164fd9g4vn4p51m5ygg65lkjapb9a42wkfcp4ngdqh542x313y2n"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; +TR8 = derive { name="TR8"; version="0.9.12"; sha256="0sry52a98ba07j78d1niaysb7cq5ms4grxbz5pncw1g13w6i2505"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; }; TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; }; TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; }; TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; }; @@ -2084,7 +2097,7 @@ Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mf TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; }; TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; }; -TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; }; +TimeWarp = derive { name="TimeWarp"; version="1.0.11"; sha256="0asp6in55973kbazlwwc0b6vrgbxq5hgj6v5apzk4xnpdd53yl8g"; depends=[]; }; Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; }; TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[Hmisc gplots]; }; TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[RColorBrewer boot]; }; @@ -2118,7 +2131,7 @@ VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; }; VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; }; VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; -VGAM = derive { name="VGAM"; version="0.9-6"; sha256="1ibf27lnl28gs1dn0xndm8y0v7r6256mci82zjvc5qmbhb0hj18m"; depends=[]; }; +VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19b67jvw0lzxz7pzffzdbv9mj806"; depends=[]; }; VGAMdata = derive { name="VGAMdata"; version="0.9-5"; sha256="0cmb0zy2sbwsn4rpc6w4885gvamyjvyp53wn9934mwdvigm63wj9"; depends=[]; }; VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; @@ -2130,7 +2143,6 @@ VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgsln VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; }; VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; }; VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; -VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; }; VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; }; VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; @@ -2171,7 +2183,7 @@ WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; }; WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; }; XBRL = derive { name="XBRL"; version="0.99.15"; sha256="0fscvl7i205h0ax8g78v5n75bfqbna6cr7lg8jkicjbf4v791hhz"; depends=[Rcpp Rcpp]; }; -XLConnect = derive { name="XLConnect"; version="0.2-10"; sha256="1dfch76l4pl9zmcp3h4kwycdivzp7nl2li6g8h5kdm9qiy1v0384"; depends=[XLConnectJars rJava]; }; +XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; }; XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; }; XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; }; XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; }; @@ -2198,7 +2210,7 @@ abc = derive { name="abc"; version="2.0"; sha256="0fs6hxyk95c61mn3p642xs3ib9wfji abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; }; abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; }; abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; }; -abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; }; +abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; }; abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; }; abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; }; @@ -2246,14 +2258,14 @@ aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; }; agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[Matrix igraph]; }; agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[klaR MASS nlme cluster spdep]; }; -agridat = derive { name="agridat"; version="1.10"; sha256="007xhynxsiqk2jnn9a1q77q1b42gwaky4vjyd034m56q3kz0adhn"; depends=[lattice reshape2]; }; +agridat = derive { name="agridat"; version="1.11"; sha256="1bnkzacwp22dw5vppm4yz583h1dw5d93dlca9i3ba2y9dzsalx0d"; depends=[lattice reshape2]; }; agrmt = derive { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; }; agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; }; aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; }; akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; -alabama = derive { name="alabama"; version="2014.12-1"; sha256="0rp9x5lijisxh57miy2l5jp7jinn200v9y3vfyriknr7903lg0if"; depends=[numDeriv]; }; +alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; }; algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly stringr reshape2 Rcpp Rcpp]; }; allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; }; @@ -2268,7 +2280,7 @@ alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1q alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; }; amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; }; amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; -amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; depends=[]; }; +amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; }; aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; }; analogue = derive { name="analogue"; version="0.16-0"; sha256="1izbqzmnw4hmirjlvwp15imzaai2kxbv2gzc58y5awwbfdrg314m"; depends=[vegan mgcv MASS brglm princurve lattice]; }; @@ -2310,7 +2322,7 @@ aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; }; archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; archiDART = derive { name="archiDART"; version="1.0"; sha256="0fahcw3032rvz1qd2vv872k8d7845zjfm2byrk1nk5b34z25wm2b"; depends=[]; }; -archivist = derive { name="archivist"; version="1.2"; sha256="10h5b8lkwndg7pn07kbj1qz1ym19alnjr43azwr1sljxybf86pb8"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; }; +archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; }; arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; }; argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; @@ -2390,7 +2402,7 @@ bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; }; bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; }; bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; }; -bayescount = derive { name="bayescount"; version="0.9.9-2"; sha256="1f27dkdgpylk1v0m722r0jxha9sl17zgl1s5apnd8ihgsajm7sdc"; depends=[runjags coda lattice]; }; +bayescount = derive { name="bayescount"; version="0.9.99-4"; sha256="1ylz7wwc3kdff9b7gs8k36i90bc7pa8z207mhnxn0qzjv1qwjq6r"; depends=[runjags rjags coda]; }; bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; }; bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; }; bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; @@ -2464,7 +2476,7 @@ bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfch bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; }; binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; }; -binda = derive { name="binda"; version="1.0.1"; sha256="1qffiz1ndjjv9ml9m07f3w8c1iqd4ldladcab7izbidj7iw41y3f"; depends=[entropy]; }; +binda = derive { name="binda"; version="1.0.2"; sha256="1hfqx79pq9bn37j8rwv11wsv6d9prph26p2hqmnxilsdxr953ib2"; depends=[entropy]; }; bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; binequality = derive { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist survival ineq]; }; bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; }; @@ -2477,12 +2489,12 @@ binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h binr = derive { name="binr"; version="1.0"; sha256="0wgc78kx51qfn5wfzll5nz8iwanixkyb5sbqwi40fak93bvycklm"; depends=[]; }; binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; }; bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; -bio3d = derive { name="bio3d"; version="2.1-3"; sha256="1iip34prynbib0aasrcxr1gck2vmal8vxwyrjx7ra9pq9zcnvjyq"; depends=[]; }; +bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; }; bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; +biogas = derive { name="biogas"; version="1.0"; sha256="0c7ayhmy69k08f32i1agri349wm1addibw4xp9rjq9cmkdhazvbd"; depends=[]; }; biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; }; biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; }; biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; }; -biomonCore = derive { name="biomonCore"; version="1.3.50"; sha256="14s4lwax27zy989lh3aw7y7gasbvcpsm66m482wlh1r58d9x93rq"; depends=[analyz]; }; bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; }; bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; }; @@ -2511,7 +2523,7 @@ blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ck blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; -blocksdesign = derive { name="blocksdesign"; version="1.4"; sha256="0ikpqrx7lwf13028drvrwni868a8gs9lw2w05hqz5a5yknks97lk"; depends=[crossdes]; }; +blocksdesign = derive { name="blocksdesign"; version="1.5"; sha256="06i8yphfp5g5bhs6s0gl0mb51vdk8idqifv18bkaqlh9qvbrd6rd"; depends=[crossdes]; }; blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; }; blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; }; bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; @@ -2529,12 +2541,13 @@ bold = derive { name="bold"; version="0.2.0"; sha256="06dnhhf2bmiqxizarsqd6l2dcs boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; }; boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; -boot = derive { name="boot"; version="1.3-15"; sha256="0d2faa3vs31af9bc4kzfywz60jib8b7j233xb5pzpj3y2j6mdjlr"; depends=[]; }; +boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73q0s3fgmf65fmh0rr3ryljvzp6sq"; depends=[]; }; bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; }; bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; }; bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag586xliapp1ninz7qxczl8jmxa9sx9z89"; depends=[]; }; bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; +bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; }; bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; }; bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; }; @@ -2575,6 +2588,7 @@ bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; }; c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; +cOde = derive { name="cOde"; version="0.1"; sha256="1cjp63lya2r82fgjwz8mnzs50x7hyzg87dkm006m76xs1iyv988i"; depends=[]; }; cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; }; ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; }; caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; }; @@ -2589,10 +2603,10 @@ cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2 candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; }; cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; }; caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; -capm = derive { name="capm"; version="0.5"; sha256="1pal7v965zyl52fivdqn30w570gvhxjsnafml6jz16x4kszw5jar"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; +capm = derive { name="capm"; version="0.7.0"; sha256="00bvrc5km6k9zvlznvqc6gj806fgb3r0x0yrnmxyk21b0acl5g20"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; }; capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; }; capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; -car = derive { name="car"; version="2.0-24"; sha256="1rg2asrwwwinqn0h7xqyx8qv77yq1sa13c8sbmnz8bzm9xx366as"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; +car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; }; carcass = derive { name="carcass"; version="1.3"; sha256="1psxdxdqlc999xylizj5vg1p1pzyrikg9gjqvpv4k0q9b5h0nrpj"; depends=[lme4 survival expm arm MASS]; }; cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; }; care = derive { name="care"; version="1.1.7"; sha256="0lgas00qp1cvn3cbimxlli99czvkh6b9hxahzif5fgbnfik4d47y"; depends=[corpcor]; }; @@ -2685,8 +2699,10 @@ classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; }; clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; }; clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; }; +clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[lubridate XML selectr RCurl ggplot2 scales RColorBrewer reshape2]; }; climdex_pcic = derive { name="climdex.pcic"; version="1.1-5"; sha256="0r6y3ylxdfkbhrx4vbzs1f7y86gdfny3dxzskc48l3qv75q5276m"; depends=[PCICt caTools Rcpp]; }; clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; +climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[ggplot2 gridExtra evd lme4 lubridate MuMIn reshape]; }; clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; clinfun = derive { name="clinfun"; version="1.0.9"; sha256="1igj48kp8898inxp6ynz0sgrc54s6k8whzgf5d349z4dn2jvizsb"; depends=[mvtnorm]; }; clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; }; @@ -2703,6 +2719,7 @@ clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256=" clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; +clusterSEs = derive { name="clusterSEs"; version="1.1"; sha256="1dbc7177mx6g0ds1biy6kwhlj0maqdb65zqlrdn6086d4i3s3xng"; depends=[sandwich lmtest mlogit]; }; clusterSim = derive { name="clusterSim"; version="0.44-1"; sha256="18l643w3zps3bhldc5z9zqa5sy1c459r0hrzb26ykydnh8xbahdy"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; }; clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; }; clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; }; @@ -2719,14 +2736,14 @@ cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrq cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; }; cna = derive { name="cna"; version="1.0-2"; sha256="06q335jr4kdydk79s8f1fg67wflhcb5ngl6gk1fqb096zkmhszxf"; depends=[]; }; cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; }; -coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; }; +coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; }; cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[SparseM quantreg]; }; cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; }; cocor = derive { name="cocor"; version="1.1-0"; sha256="1qmpgs9krbyvr8803r4y0gxwz2wl5frkzyxaa9756q27bw2igyrp"; depends=[]; }; cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; }; cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; }; -coda = derive { name="coda"; version="0.16-1"; sha256="0575pbx37jn7ljgjybl2v7rry55l6s6cb3a0m9znh4blln405q4i"; depends=[lattice]; }; +coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; }; codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; }; codetools = derive { name="codetools"; version="0.2-10"; sha256="0giqf14kmqps181jfb78mgii1852rp4kz0k96pabm4h0yv02b49j"; depends=[]; }; @@ -2740,7 +2757,7 @@ coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; -colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; }; +colorspace = derive { name="colorspace"; version="1.2-5"; sha256="1215nn2gczbxpvpwl1szbs0ibxihycfqc74wk6c166ni6515zi1z"; depends=[]; }; colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[XML RJSONIO png]; }; comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; }; @@ -2785,7 +2802,7 @@ cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; }; copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; }; cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[maps fields MASS mvtnorm]; }; -copula = derive { name="copula"; version="0.999-12"; sha256="131wr6a7qxsdsl9f5amjkzj2wwgdwlg85a1pmd0bflzfi86dvrdf"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; }; +copula = derive { name="copula"; version="0.999-13"; sha256="0yjy03wn6lsiacfh7qblspklxc9kfwd3g7bz2fx2ldkd90rwhmqp"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; }; copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; }; corHMM = derive { name="corHMM"; version="1.15"; sha256="1f1qq8fnnx68mpfj863pml4xynxsl21f9r1qqv7yfrx14daki4a0"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; }; corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; @@ -2811,7 +2828,7 @@ covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; }; covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; coxinterval = derive { name="coxinterval"; version="1.0"; sha256="0x6xnc5wf5sivwn0hd99lmb52wj5swj01r9wrky9f61nji3fjv4v"; depends=[Matrix survival timereg]; }; -coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48q9i7hdppn1k528nfca5ikw2l37h9"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; +coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; }; coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; }; coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; }; coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; @@ -2821,7 +2838,7 @@ cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhf cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; }; cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; }; -cqrReg = derive { name="cqrReg"; version="1.0"; sha256="04hx7zysymw00dnfifk30cy1r63vnj6ycq37g25lgq38qr6bbbis"; depends=[Matrix Rmosek Rcpp Rcpp RcppArmadillo]; }; +cqrReg = derive { name="cqrReg"; version="1.1"; sha256="0apgkb9lkqgl5a10m80m3i9zly0k9v45y1y689dsjbdlvmqhdan6"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; }; cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; }; crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; }; cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; @@ -2849,7 +2866,7 @@ cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; }; cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; -csvread = derive { name="csvread"; version="1.1"; sha256="0bk6jjjv88d7l511a5fa1530i8pnzr3brambchl69mv9h6si14bq"; depends=[]; }; +csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; }; cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; }; ctv = derive { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; }; cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; }; @@ -2930,7 +2947,7 @@ deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fg deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; }; -deldir = derive { name="deldir"; version="0.1-7"; sha256="0di37vy2na4wm5281831f5rj855lq9pjf2k61lfl1vslr5fjx96i"; depends=[]; }; +deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; }; deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; }; deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; @@ -2943,7 +2960,7 @@ dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; }; densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; }; denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; -depend_truncation = derive { name="depend.truncation"; version="2.1"; sha256="1b13mqm8pjw0r0z5h7vizz15nzhslxhcn4cb8pzadyq98mcmk4g2"; depends=[mvtnorm]; }; +depend_truncation = derive { name="depend.truncation"; version="2.2"; sha256="0frszpsnhf5ci471h6izsp0qan87li8spvpdvr47kklg3qxq0py2"; depends=[mvtnorm]; }; depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; }; depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; }; depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; }; @@ -2952,7 +2969,7 @@ descomponer = derive { name="descomponer"; version="1.1"; sha256="0yw3659lv3y187 descr = derive { name="descr"; version="1.0.4"; sha256="149p2znadm4qvz1cqk4k8w7wqqn8jsvjxabgd9qy2rfv41qgcri8"; depends=[xtable]; }; deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; }; designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; -desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4ypiscqd2nmh38sd0q7k3r60h2zdrq3wbm1vyyzygk"; depends=[]; }; +desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; }; desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; }; detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; @@ -2996,7 +3013,7 @@ discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph discreteRV = derive { name="discreteRV"; version="1.1.4"; sha256="1bxr8rjqjx58bkkp96zk3hdssp43kcdzfjif95kda25by7926s3z"; depends=[plyr MASS]; }; discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; -diseasemapping = derive { name="diseasemapping"; version="1.1.5"; sha256="1v1pbsi15dizclmpqqjiwkwfv55ai4hky71rza4nfmyffjznwdz8"; depends=[sp]; }; +diseasemapping = derive { name="diseasemapping"; version="1.1.7"; sha256="1sxvvs7sprjqzd8h51xk6i7jw8081bxzqxllqqhlz105g8czqpwi"; depends=[sp]; }; diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; }; dismo = derive { name="dismo"; version="1.0-5"; sha256="1zzzj4r96a35ghngszym1dg1wbr8mvinn7cvmqwnnjn3c2zq4w0g"; depends=[raster sp]; }; disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; }; @@ -3051,10 +3068,11 @@ dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pq dpcR = derive { name="dpcR"; version="0.1.3.3"; sha256="1j2c3b6727598lmz29vl5f4jkf5v1621g3cli588k10frlq55nip"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; }; dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; }; +dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; }; dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; }; dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; }; -drat = derive { name="drat"; version="0.0.1"; sha256="1vj67q8l6mjkzrdyi325jjdpr0gr1i6sns8sdk4g964kx372f7ih"; depends=[]; }; +drat = derive { name="drat"; version="0.0.2"; sha256="0rsjkwg3dzyv8fi4p889rsq7k51zw8afaldmf7blssz8q7m3i3lv"; depends=[]; }; drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; }; drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; }; @@ -3079,7 +3097,7 @@ dunn_test = derive { name="dunn.test"; version="1.2.3"; sha256="1p9bmjq3rj674mss dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; }; -dygraphs = derive { name="dygraphs"; version="0.4.1"; sha256="0d3idvmv79qmgsh55lgznxxcdw1bqgwzj481nvcsspssymysfgqq"; depends=[magrittr htmlwidgets zoo xts]; }; +dygraphs = derive { name="dygraphs"; version="0.4.2"; sha256="0wv9mmylfsi3q1hi5wdhnynmcclw3sl7pscpp49ddaz3psg686kz"; depends=[magrittr htmlwidgets zoo xts]; }; dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; }; dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; }; dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; @@ -3112,7 +3130,7 @@ ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793 ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; }; ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; }; ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; }; -ecospat = derive { name="ecospat"; version="1.0"; sha256="1pnyiy89smr0cnw1z5cv83b7dybzs5h2kfyxis2k3rlx26rzczfv"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; }; +ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; }; ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; }; ecp = derive { name="ecp"; version="1.6.2"; sha256="0j416ns93m7vrb7dnyr4prqm213cg19hbgffvscnb67y3qwj6lic"; depends=[Rcpp Rcpp]; }; edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; @@ -3146,6 +3164,7 @@ ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpx elliptic = derive { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii4z35nws2gc00xkk0dncll0sf5nshcj8fl5"; depends=[MASS]; }; elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; }; elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; }; +emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; }; embryogrowth = derive { name="embryogrowth"; version="5.1"; sha256="1irdx1zkp1k4hqi9c9hrckiy647nld2n9mgw9kx8gp771963n5rq"; depends=[deSolve phenology Hmisc]; }; emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; }; emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; }; @@ -3218,7 +3237,7 @@ evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1s evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; }; exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; }; -exact2x2 = derive { name="exact2x2"; version="1.4.0"; sha256="1yzigyyvzs3aq3sl3birs9bzir1l8b30qfbhfg5aw80w6a5p0hb1"; depends=[exactci ssanv]; }; +exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; }; exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; }; exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; }; @@ -3329,7 +3348,7 @@ fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; -fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; depends=[spam maps]; }; +fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[spam maps]; }; fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; }; filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; }; filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[filehash DBI RSQLite filehash DBI]; }; @@ -3370,7 +3389,7 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; }; foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; }; -forecast = derive { name="forecast"; version="5.8"; sha256="1f8qfh9z02fhgarhfjp7j25fvsirly08ln8l91a3cg1y2vzi18sv"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; +forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6gbbhnnn9yhsd1b1hsldj9lpf5ykzf4qc"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; }; foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; }; forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; }; forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; @@ -3390,7 +3409,7 @@ fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j2 fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; }; frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; -frailtypack = derive { name="frailtypack"; version="2.7.2"; sha256="07vhpz757argz9k15lxnn2iad1gybnnjgw6n9pp7sghh5bynx5j1"; depends=[survival boot MASS survC1]; }; +frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[survival boot MASS survC1]; }; frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; }; frbs = derive { name="frbs"; version="3.0-0"; sha256="0v2l8s5jla8jsl9izqfpxhcd1dnrxsa0czlhq1wmx5k06jvbvpdw"; depends=[]; }; freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; }; @@ -3405,7 +3424,7 @@ frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3 frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; }; frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; -fscaret = derive { name="fscaret"; version="0.9"; sha256="082k67fd666hjcarsxmhn8hbscv5l8l0n84kv5asqjjshgz0nzwz"; depends=[caret gsubfn hmeasure]; }; +fscaret = derive { name="fscaret"; version="0.9.3"; sha256="0jfksc0m2jjgik2zbrmhjb8ngr5s58nxqrx68wd59vpnxixn0fv4"; depends=[caret gsubfn hmeasure]; }; fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; }; fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; }; fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; @@ -3511,7 +3530,7 @@ genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14 genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; }; genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; }; genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; }; -gendata = derive { name="gendata"; version="1.0"; sha256="1hyyf9kpf8f0xxwwvirxlz6nw6wf2wqq5vvjnyikq5dwa7a3ngmw"; depends=[]; }; +gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; }; genderizeR = derive { name="genderizeR"; version="1.0.0"; sha256="1a4zjbg8v7ig6hglbkvxbsp4q9hyy3zr751vmcsv529ikgiikkji"; depends=[jsonlite stringr tm data_table magrittr RCurl]; }; geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; @@ -3523,11 +3542,11 @@ genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5g genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[plspm quantreg mice diagram]; }; genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; }; gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; -geoBayes = derive { name="geoBayes"; version="0.1.3"; sha256="0i5yxdgcbikq9b69f9z7080mcrff7phzij25q9jsd63rlld1nz77"; depends=[coda sp]; }; +geoBayes = derive { name="geoBayes"; version="0.2.150308"; sha256="0n1i3l0qk5yy3h7hdjd03wd197qrv76n4vq3pv8av4n2k4m7dk2v"; depends=[coda sp]; }; geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; }; geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; }; geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; }; -geocodeHERE = derive { name="geocodeHERE"; version="0.1.1"; sha256="1j7xw3ca9clyxcq0banj8cw03f7ryj6pidn5hrff2xvfz215qz7h"; depends=[httr]; }; +geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; }; geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; }; geomorph = derive { name="geomorph"; version="2.1.3"; sha256="1jym15xlpbgc6lfd8dzl6ixc9mn79m1a9a8jiw1yjw9kgkvp8w6p"; depends=[rgl jpeg ape geiger phytools]; }; @@ -3538,7 +3557,7 @@ geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrl geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; }; geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7dfh8ld3fa795ysf4sl8a1jg3jc12nrrx85cwl74"; depends=[sp]; }; geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; }; -geostatsp = derive { name="geostatsp"; version="1.1.9"; sha256="1m6cihsm6k9l3kdp8chvsz5cqllbmk0mx08n8wp6zkaa02kl9izn"; depends=[Matrix raster sp abind numDeriv pracma]; }; +geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[Matrix raster sp abind numDeriv pracma]; }; geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster stringr zoo rgdal]; }; geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; }; @@ -3546,20 +3565,19 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; }; gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; }; -ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; }; ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive { name="ggRandomForests"; version="1.1.3"; sha256="0yz25imvlpblrw2v9b5s39na9diljh2g93mmcv9gljad40iy34va"; depends=[randomForestSRC ggplot2 survival dplyr reshape2]; }; ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; }; +ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; }; gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; -ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; }; +ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj jpeg geosphere digest]; }; ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; }; ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; }; ggplot2 = derive { name="ggplot2"; version="1.0.0"; sha256="138rxp8zr0x945ajmhg35x35xs0ci743iqhffqy90c7hcn0gpvz6"; depends=[plyr digest gtable reshape2 scales proto MASS]; }; ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; }; ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; }; -ggtern = derive { name="ggtern"; version="1.0.3.2"; sha256="05nh8610l5lw41wkidl2m78nqyfbc7faiawpc442lin3qxrj64bq"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; }; -ggthemes = derive { name="ggthemes"; version="2.1.0"; sha256="1gcl0mw3yq4yskwq1yjjx4bs9hv47s9apxgpjlciaih0b5zw2461"; depends=[ggplot2 colorspace proto scales]; }; +ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; }; ggvis = derive { name="ggvis"; version="0.4"; sha256="09q7ccg5lsj0qqixpiq4xccpqckr7g4ws7ysr5mac3sgl8hm9r87"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; }; ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; }; giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; @@ -3670,11 +3688,12 @@ gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6 gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; }; gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; }; gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; -gte = derive { name="gte"; version="1.2-1"; sha256="0h6c5n9wz8b4b5pmqfbc8ivqpg2jh4k6x94wns1l33kiah70pmjd"; depends=[survival]; }; +gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; }; +gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; }; gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; }; -gvcm_cat = derive { name="gvcm.cat"; version="1.7"; sha256="0wgras21wzx1magcayz9nra8licrbx8aglmc272wrw3nqiagh0fi"; depends=[Matrix MASS]; }; +gvcm_cat = derive { name="gvcm.cat"; version="1.8"; sha256="05bl9ikgv1h5rm6lg2qz4g22d5ir8x2gs3wk58lnvvpdvksd8l7s"; depends=[Matrix MASS]; }; gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; @@ -3689,6 +3708,7 @@ harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hlia hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[]; }; +haven = derive { name="haven"; version="0.1.1"; sha256="0lc6zsl688ms76qjb3lsbid968byq3084513q6g9a1caa3qmvhz0"; depends=[Rcpp Rcpp BH]; }; hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp Rcpp RcppArmadillo]; }; hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; @@ -3713,7 +3733,7 @@ heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive { name="helsinki"; version="0.9.24"; sha256="1ljqgwcmvcmir8fq3izym4k8ljakwqpgq94wfhrdxp0q393zb8rq"; depends=[maptools RCurl rjson sp]; }; heplots = derive { name="heplots"; version="1.0-12"; sha256="064kanmqm4b0sbyw60wfb19adclpdagm23l6p86vi0hyx0dr0ykz"; depends=[car MASS]; }; -hergm = derive { name="hergm"; version="2.1-1"; sha256="0d2y4zkd5xv1r4ynkwwaj4kj54m5avlrnk60m3xsfbwcbbblf2fx"; depends=[ergm latentnet network sna]; }; +hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; }; heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; }; hermite = derive { name="hermite"; version="1.0.1"; sha256="0y49dj905y9x4pjrx6iki3mk5kkppbd1c6dk0yvvh7sisapnphjx"; depends=[]; }; het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; @@ -3755,6 +3775,7 @@ holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalz homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; }; homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; }; homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; +hornpa = derive { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; hot_deck = derive { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7f3ns8kk308f6b6lhwfpjqfz0wgysnfq9"; depends=[mice]; }; hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; }; howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; }; @@ -3765,11 +3786,12 @@ hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; }; -htmlTable = derive { name="htmlTable"; version="1.1"; sha256="18nw20y3v5rqq3kfybm2clr8vmr43i5girfjzcrngbmy3qxiq64j"; depends=[stringr knitr magrittr Hmisc]; }; +htmlTable = derive { name="htmlTable"; version="1.2"; sha256="06hbc3wvymksr83cxy9rjkfw860sfg513ylipgdnxzr5h986hfad"; depends=[stringr knitr magrittr]; }; htmltab = derive { name="htmltab"; version="0.5.0"; sha256="1c5bcx00wgh2xvghg91jyv7086y5ya0bil4igfsqjqsn0lfcjxpg"; depends=[XML]; }; htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; }; htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; }; hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; }; +httk = derive { name="httk"; version="1.1"; sha256="198zxzap9m8c6rlzqjfrg6b9pvgbksk2myq5cw7j37j63lfnblki"; depends=[deSolve msm]; }; httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; }; httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; }; @@ -3787,11 +3809,11 @@ hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36s hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; }; hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; }; hydrostats = derive { name="hydrostats"; version="0.2.3"; sha256="1hd4jcdkdl546kqvx9swnqn7gjvd7ppz034cqflpckhn68rc62g7"; depends=[]; }; -hyperSpec = derive { name="hyperSpec"; version="0.98-20140523"; sha256="1ypmq5xgcjqrq9i8f08csjqffv9qfpfkvrbawlf1ds7i49h6jq28"; depends=[lattice mvtnorm]; }; +hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[lattice ggplot2 mvtnorm latticeExtra svUnit]; }; hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; }; hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; }; hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; }; -hypervolume = derive { name="hypervolume"; version="1.1.2"; sha256="1d4c5lfvr32w5mdrll6kg7frykhc8wfg3i5v3a93s0df02yprc4s"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; +hypervolume = derive { name="hypervolume"; version="1.2"; sha256="0ww2i04rvgpy2wfszjxhqaylix1s65nw46psw4w96l6jzf113x5w"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; }; hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; depends=[]; }; hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; }; @@ -3813,7 +3835,7 @@ ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxa ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; }; ibelief = derive { name="ibelief"; version="1.0"; sha256="1mcmq1zpj1f6alhnsznb27iknp7dzdsd25di8a64hw5c3cnx3xay"; depends=[]; }; -ibmdbR = derive { name="ibmdbR"; version="1.34.3"; sha256="0b0v61sf033fmhp2vn6g5vgy3irsqlpqgiz8j0h068p4fr2q660v"; depends=[RODBC MASS]; }; +ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[RODBC MASS]; }; ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; }; ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; }; ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; @@ -3851,6 +3873,7 @@ indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7 indicspecies = derive { name="indicspecies"; version="1.7.4"; sha256="1b9fgdsprh89siqps30v2yz0hsvfxffz2ynp1z74dmvx52iih4vs"; depends=[permute sp rgeos]; }; ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; +inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; }; inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; }; influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; }; influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; }; @@ -3899,7 +3922,7 @@ irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; }; isdals = derive { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; -isingLenzMC = derive { name="isingLenzMC"; version="0.2.1"; sha256="1g1rz8p9vw2jnx6qw9mb614fpkv5bd7cndwcz0mva33y5shhnibl"; depends=[]; }; +isingLenzMC = derive { name="isingLenzMC"; version="0.2.3"; sha256="1rkry39yhxvq3ypnnxgdv15kd5w0l5w56ywmkcsgkwlxdfrvlyn2"; depends=[]; }; ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; }; isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; }; isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[vegan cluster]; }; @@ -3915,6 +3938,7 @@ itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; }; its = derive { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; }; +itsadug = derive { name="itsadug"; version="0.8"; sha256="1lphbw1d1x1bs625rnr9jl3zyaqr8rka8d0v2v3cf3crywc3lzhn"; depends=[mgcv]; }; itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; }; ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; }; ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; @@ -3931,6 +3955,7 @@ jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip jiebaR = derive { name="jiebaR"; version="0.4"; sha256="0vm41z2kc5zvvqmamwfqacc1ndpa0npk515zn7v4bd6gv6dw2lgn"; depends=[jiebaRD Rcpp Rcpp]; }; jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; }; +joint_Cox = derive { name="joint.Cox"; version="1.0"; sha256="1460i8ydwd0ix3slm9bn8jca5b1vs0w2wwx1md4npbmf5ly5x42l"; depends=[]; }; jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; }; @@ -3938,7 +3963,6 @@ jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; }; jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; }; jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; }; -jwutil = derive { name="jwutil"; version="1.0.2"; sha256="01c2mjg719bqjzca1a0ac6q0af2jc95jb292smvrq4bx1bd5nwpi"; depends=[]; }; kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; }; kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; }; @@ -3983,14 +4007,14 @@ kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxg kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; }; kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; -krm = derive { name="krm"; version="2014.12-1"; sha256="0lf506q6975vihkd75wwndqaa86ci4d4k4ijjzpvv31xw2kkbwb6"; depends=[kyotil]; }; -ks = derive { name="ks"; version="1.9.3"; sha256="077sx9kms8nkgg6c4bg24n0j6a7bf253bp26hybyilbagp7k6pin"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; +krm = derive { name="krm"; version="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; }; +ks = derive { name="ks"; version="1.9.4"; sha256="0gi93d981y2i5q80wxh7f4dwwh7sjw6iy63y7571nzf01yw00gbx"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; }; kselection = derive { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; }; ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; }; kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; -kyotil = derive { name="kyotil"; version="2014.10-5"; sha256="1gfgrqqg1r8xydlyvrarj7mngy64ppfm6bszqkmy2rbfrj1n29hl"; depends=[]; }; +kyotil = derive { name="kyotil"; version="2015.2-27"; sha256="0xx54b332bfg0b69m80d2qafcy7bwc5b7paq3x02rkh6xllsnq4y"; depends=[]; }; kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; }; kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; @@ -4005,6 +4029,7 @@ labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh laeken = derive { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; }; laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[maptools rgdal raster rgeos sp geosphere]; }; +laketemps = derive { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lambda_r = derive { name="lambda.r"; version="1.1.6"; sha256="03f3945f9kqj7in1mxk23ai56x68rdyd10c3ki4nqqysshyjr4d4"; depends=[]; }; lambda_tools = derive { name="lambda.tools"; version="1.0.3"; sha256="1vd1ms8yzy01wvg4baj2ypyiyy27ck3na9awlmvhdvxc1s459sr7"; depends=[lambda_r]; }; landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; @@ -4036,7 +4061,7 @@ lbfgsb3 = derive { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnw lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; }; lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; -lcmm = derive { name="lcmm"; version="1.6.6"; sha256="1n3m1r34rvdjjpj4854iwy74vlhwiaj30q48rk9jph98q4hz3vgx"; depends=[survival]; }; +lcmm = derive { name="lcmm"; version="1.7.2"; sha256="1sg5vx3nx8ik5z2c2pi3p9h5b5k0z7m1jc404jkv3gr17nilcp4i"; depends=[survival]; }; lctools = derive { name="lctools"; version="0.1-3"; sha256="1wn9qymbcq9q99xnjbk3qswrfljvfqqhihvgr0brbpq3pbbxh55x"; depends=[reshape weights]; }; lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; }; ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; }; @@ -4052,7 +4077,7 @@ leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8 lessR = derive { name="lessR"; version="3.2"; sha256="05d8xsf9n52l0hsvww4yk8wl14sw02yc0w4ajrzrjwb68sp75qf8"; depends=[car leaps MBESS foreign gdata triangle]; }; lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; }; -lfe = derive { name="lfe"; version="2.0-1570"; sha256="0j3xbch6xk8zm4wbhs9lr60893r0dsqfvlvd8l13bqa3sq9xfhp6"; depends=[Matrix Formula xtable]; }; +lfe = derive { name="lfe"; version="2.1-1629"; sha256="1f79m3ck9anfimhkksb6nwc8ppwaard4bqc441xk2ch2vv6ap5p9"; depends=[Matrix Formula xtable]; }; lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; }; lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; }; lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; @@ -4155,7 +4180,7 @@ lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1x lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsmeans = derive { name="lsmeans"; version="2.15"; sha256="14fl0nfqypbnqqdl7q0gvjn9880j6wkdk48jbf0xq953l11qw4sh"; depends=[estimability multcomp plyr Matrix mvtnorm]; }; lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; -lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; }; +lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; @@ -4181,7 +4206,7 @@ maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcq maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; }; maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[rpart C50]; }; mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[mvtnorm ellipse mvmeta]; }; -mads = derive { name="mads"; version="0.1.1"; sha256="070948j1r1dpymg2smgciz87nzpkv5fwvfsfppf0jrgfncivav1l"; depends=[mrds]; }; +mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; }; madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; }; magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; magicaxis = derive { name="magicaxis"; version="1.9.3"; sha256="0dxlqpxw82v9cxfp475ppd02ywvlg96b1cfj02fjvs04xfprhar0"; depends=[MASS plotrix sm]; }; @@ -4224,7 +4249,7 @@ maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hfl maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; }; maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; }; maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; }; -mbbefd = derive { name="mbbefd"; version="0.6"; sha256="0lmidvganblkd1lxq4fy1rapzzdn89w3277nblw6nxjp33yx4nzm"; depends=[Rcpp Rcpp]; }; +mbbefd = derive { name="mbbefd"; version="0.6.1"; sha256="18vi4cans7h7lykfablrzvpvzd1zvfp2ycjf47gwjvg54ri1nnml"; depends=[Rcpp Rcpp]; }; mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; }; mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; @@ -4258,7 +4283,7 @@ meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhk medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; }; medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; }; -mediation = derive { name="mediation"; version="4.4.3"; sha256="1m3q7zw1wsl6nnfjigbp3yg8mjnqxzawbgdrj7diclz8s6f07b4x"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; +mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; }; medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[plyr reshape2 hash]; }; mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; }; mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; }; @@ -4266,7 +4291,7 @@ megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[plyr leaps MASS]; }; mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[sm boot]; }; memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 raster gdistance vegan]; }; -memisc = derive { name="memisc"; version="0.96-10"; sha256="1w62kgnjw57l0l645f02r0583l4pysx8dms16j6kba5hj4g427b2"; depends=[lattice MASS]; }; +memisc = derive { name="memisc"; version="0.97"; sha256="069siqkw7ll9n1crsl3yjhybwz0w52576q504cylpvlxx3jm9hfs"; depends=[lattice MASS]; }; memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; }; memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; }; merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; }; @@ -4291,10 +4316,9 @@ meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkg meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5a36s2dqx42kzwbzgvp1m11z225"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; }; mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; -mfblock = derive { name="mfblock"; version="1.0"; sha256="06raii52gb7fzh23ahvkrcwvbx3mg02ww3qa340igkqys6jf3yih"; depends=[skewt boot nloptr]; }; mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; }; mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; }; -mgcv = derive { name="mgcv"; version="1.8-4"; sha256="18hd5b4p2k941f4lg18a73671hqdf2gh4z4vw08lkab10zpl59sa"; depends=[nlme Matrix]; }; +mgcv = derive { name="mgcv"; version="1.8-5"; sha256="133w7x0bys5dhsavfzh3h6gwgji0bbg2s22lgrrzigzgx65m9bfw"; depends=[nlme Matrix]; }; mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; }; mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; }; mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; }; @@ -4378,6 +4402,7 @@ mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ix mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; }; mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; }; mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; }; +mma = derive { name="mma"; version="1.0-0"; sha256="1xc138v2n0kyfjz9payps9wqamfmglvrs58ggf96wa6jp16gfcff"; depends=[gbm]; }; mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; }; mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; }; @@ -4392,7 +4417,6 @@ mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink mnlogit = derive { name="mnlogit"; version="1.2.0"; sha256="0ymkm3xwm97v5f9lg2ir4czdfb47hibgrkirc2iw66fh24iah84m"; depends=[mlogit lmtest Formula]; }; mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive { name="mnormt"; version="1.5-1"; sha256="1msxbdlg4wb45lsg0m4hqf41qglnmbqw55815v8qvyfjkwrgns8b"; depends=[]; }; -mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; }; modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; }; modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; @@ -4409,7 +4433,7 @@ mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6 monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; }; monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; }; monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; }; -monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; }; +monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; @@ -4434,13 +4458,12 @@ mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; }; mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; }; -mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; }; mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[optimx mgcv Rsolnp]; }; mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; }; msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; }; -msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; }; +msSurv = derive { name="msSurv"; version="1.2-1"; sha256="1c6db2mymaflxys736vh0gdapwlnr2ld0nkj4wbcb7saw377g7v9"; depends=[class lattice]; }; msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; msarc = derive { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[gplots XLConnect wordcloud RColorBrewer]; }; msda = derive { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[Matrix MASS]; }; @@ -4458,7 +4481,7 @@ mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; }; -multcomp = derive { name="multcomp"; version="1.3-9"; sha256="1makqj75d7nfklxmbmxrgr9285ssjviy6nybsbm0ygx43l1r05xj"; depends=[mvtnorm survival TH_data sandwich]; }; +multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; }; multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; }; multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; depends=[gnm VGAM]; }; multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; @@ -4468,7 +4491,7 @@ multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; }; multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; }; multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; }; -multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; }; +multicool = derive { name="multicool"; version="0.1-5"; sha256="01a429hyizqjg3dglnm0b3gl1lclp1az40cr3wr9qcx12jn30fbz"; depends=[Rcpp Rcpp]; }; multigroup = derive { name="multigroup"; version="0.4.3"; sha256="153pg27dz61igagn1yq4xl7m7vjb5vfc9ps1xhgzvmbvmnbcr004"; depends=[MASS]; }; multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; }; multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; }; @@ -4526,7 +4549,7 @@ mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j6 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[rms mclogit]; }; nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; }; -nCal = derive { name="nCal"; version="14.11-8"; sha256="0cgn56alv4qrb0dv7g3v3nx0y4bqgxyxrkbml7rqfz95s3rvm2dh"; depends=[drc gdata gWidgets kyotil]; }; +nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; }; nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; }; nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d7kkaw1bkdkj3q11g3xq84hx9"; depends=[ape coda deSolve]; }; @@ -4541,6 +4564,7 @@ nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256 nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; }; naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; }; nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; }; +ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra scales gtable PerformanceAnalytics lattice knitr xtable reshape2]; }; ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; }; ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; }; @@ -4560,13 +4584,13 @@ nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxl netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; }; netassoc = derive { name="netassoc"; version="0.4.1"; sha256="1rwswa70n6j3s779cq3ddg8kgj17bx5iqya1rrspqd7rjj95k1bk"; depends=[igraph]; }; netgen = derive { name="netgen"; version="1.0"; sha256="01j5s80k658wcp8ml2kyf10dvajp4crrxcad65rs03grak1q5mkv"; depends=[BBmisc mvtnorm lhs ggplot2 lpSolve checkmate]; }; -netgsa = derive { name="netgsa"; version="1.0"; sha256="1f70wpwj0gdc4k9cm7glz5jfd1xdij9bxkaqd8lpjxmarap00w6x"; depends=[cvTools corpcor glasso glmnet igraph]; }; +netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[cvTools corpcor glasso glmnet igraph]; }; netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; }; nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; }; nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; }; netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; }; network = derive { name="network"; version="1.11.3"; sha256="1sp55dzf2g5znybppd1w3bmkxfx8vqh98pws438r5wwln2pjdcs2"; depends=[]; }; -networkD3 = derive { name="networkD3"; version="0.1.1"; sha256="1xslcq3a7m8l9d0jdxf4mylwyhxpxm6rnacnfmdzxsafb7bc78nk"; depends=[htmlwidgets plyr rjson]; }; +networkD3 = derive { name="networkD3"; version="0.1.2.1"; sha256="0xc3qbcb0xvdfvx2vb68rzif72x3zna32wrhz9lg9s7dfkz4xmfm"; depends=[htmlwidgets plyr rjson]; }; networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common network]; }; networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; }; networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; @@ -4585,7 +4609,7 @@ nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh5 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; }; nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; }; -nleqslv = derive { name="nleqslv"; version="2.5"; sha256="1p9m9ryp58xca9arl798cmslfjvxb3w5hdg3bs62yham1q951a48"; depends=[]; }; +nleqslv = derive { name="nleqslv"; version="2.6"; sha256="100nncpi2sx7flcxrl16csv7yprwan20ih1gydz6as5cg3k3lx9i"; depends=[]; }; nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; }; nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; }; nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; @@ -4596,14 +4620,14 @@ nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc2 nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; nlsem = derive { name="nlsem"; version="0.2"; sha256="0hq4ffkbrp6v6y5hr26hm2g110vjx3xy01y5kznigza0v9wcpzqq"; depends=[gaussquad mvtnorm nlme]; }; nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; -nlstools = derive { name="nlstools"; version="1.0-0"; sha256="04y3yzpipr82fgafppp09fbi6invmwyalljirmmh01qnrzfimwna"; depends=[]; }; +nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; }; nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; }; nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; }; nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; }; nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; }; -nodiv = derive { name="nodiv"; version="1.0.1"; sha256="07qx08s7nn7priwm5x5k3ycacfa4ibd20c759x9qhzqaigjmrh42"; depends=[picante raster ape sp vegan]; }; +nodiv = derive { name="nodiv"; version="1.0.2"; sha256="0a8p5q1r68gmwv73557xgwxp9xwh8yw287yr71lplc1dx8fxjjny"; depends=[picante raster ape sp vegan]; }; noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; }; @@ -4618,7 +4642,7 @@ norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; }; normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; -nortest = derive { name="nortest"; version="1.0-2"; sha256="010i9cxjaq6jjdnw8fggvinakrxi3pv4098r9i4jh62vlfwqbjpb"; depends=[]; }; +nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; }; nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; @@ -4676,14 +4700,14 @@ onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; }; onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; }; opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; }; -openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1hbw9gfc95b379if23wc0jv6lgf6ilb10gpwfs8nm3jc3by2zsx4"; depends=[NLP openNLPdata rJava]; }; +openNLP = derive { name="openNLP"; version="0.2-4"; sha256="11zgqi8ydv6pqjs1sbi9gsh2fxg6jyaba16h5kbi15rc75fcvw47"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; }; openair = derive { name="openair"; version="1.1-5"; sha256="1i0vif16n4y3m64q3ryrkh725b5j6b7b1g58hwz5hxzj4m2fls7l"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; }; opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; }; openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; }; opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; }; -openxlsx = derive { name="openxlsx"; version="2.2.1"; sha256="0wcvyl5gzkh28v2y40ckzp4prp9ygby01pm66rp902xhjqz0vnw1"; depends=[Rcpp Rcpp]; }; +openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; }; operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; }; operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; }; ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; @@ -4712,7 +4736,7 @@ orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1 orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; }; ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; }; ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; }; -ore = derive { name="ore"; version="1.0.6"; sha256="14ks8ypjlmdiysaayyz1syb8vrcfp2v79wfx191fz05ckgww4dyy"; depends=[]; }; +ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; }; orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; }; orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; @@ -4733,6 +4757,7 @@ p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kj p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pBrackets = derive { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; +pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 permute randomForest reshape2 magrittr]; }; pROC = derive { name="pROC"; version="1.7.3"; sha256="1xbz50phi2ygrgvcv36vnbc2icga8abjiha2ap35bwffg5d2zmvi"; depends=[plyr Rcpp Rcpp]; }; pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; }; pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; @@ -4773,7 +4798,6 @@ paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vm paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; }; parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; }; -parfm = derive { name="parfm"; version="2.5.6"; sha256="1zas6isgirha379f246zg84ddv0jl2n4795brshd98hkayl4c1fi"; depends=[survival eha msm]; }; parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; }; parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; }; parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; @@ -4838,7 +4862,7 @@ pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvi pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; }; pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedometrics = derive { name="pedometrics"; version="0.4-1"; sha256="0pzkkjp126g64q6avlk7bqrhcl6y5zz8vmfrq68k4yck34c1gn16"; depends=[car fields gstat lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; }; -pegas = derive { name="pegas"; version="0.6"; sha256="142hcc5h52sil1wp3m315y07wa6aqvx8igf2pywdz56ydwk2rwpk"; depends=[ape adegenet]; }; +pegas = derive { name="pegas"; version="0.7"; sha256="1vhlg40jz938h63isi5c8cjfqrwnh5miyl5kg2hbybw9awlp6gjj"; depends=[ape adegenet]; }; penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; }; penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; }; penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; }; @@ -4881,7 +4905,7 @@ phenology = derive { name="phenology"; version="4.0.4"; sha256="1h40dr3347nisf61 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; }; phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; }; phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; }; -phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; }; +phonR = derive { name="phonR"; version="1.0-1"; sha256="11m6qm3ya90n886mig4inxm057afl2gx4iz5fbwqsncibdmqgx92"; depends=[splancs deldir plotrix]; }; phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; }; phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; }; phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; @@ -4911,7 +4935,7 @@ pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xb plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; }; -planor = derive { name="planor"; version="0.2-0"; sha256="0mvlkrggwgrc9fmp935kihj2v7gfnghw7smpkbb3pbrrv9zhjlgi"; depends=[conf_design]; }; +planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; }; playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; }; plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; }; plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; @@ -4957,14 +4981,15 @@ poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqii pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; }; poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; }; poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; +pointRes = derive { name="pointRes"; version="1.0.1"; sha256="08mqsx45k5y43yc5g0kfr2jsxpjjsprjcii1p9i1pf0k7r8igglb"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; }; poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; }; poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; }; -pollstR = derive { name="pollstR"; version="1.1.1"; sha256="1wl5nli8y7mxwr5j1cp0z1a9ny4d1anh5pyc8vi1jbnvqdnin1v6"; depends=[httr plyr jsonlite]; }; +pollstR = derive { name="pollstR"; version="1.2.0"; sha256="1a1qjblxylzpwb1qpy2yyk39022isp8aajds5glspxndapmd4akb"; depends=[httr plyr jsonlite]; }; polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; }; -polyCub = derive { name="polyCub"; version="0.5-1"; sha256="13l0gnzj5gs4iikcaj13nsb8ndbb7asx8ycllli61az12rc2p6yf"; depends=[sp spatstat]; }; +polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; }; polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; }; polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; }; polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; @@ -4999,9 +5024,8 @@ powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sh powerMediation = derive { name="powerMediation"; version="0.2.3"; sha256="0i4qyjcmw2zvpdgq520kjzf38hddsrjwf0vlg4ylv1kaav7jzgsr"; depends=[]; }; powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; }; powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; -powerr = derive { name="powerr"; version="0.1-3"; sha256="0scarwipq8095hvj7ij849l10q2g7g5z66ws7r72apdvxs5nvxnj"; depends=[Matrix Rcpp Rcpp RcppEigen]; }; ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; }; -ppiPre = derive { name="ppiPre"; version="1.6"; sha256="0ck1xxaip614sxi8liqfhznzpq2i6f491v9kijawak5xm39bn9vv"; depends=[igraph e1071]; }; +ppiPre = derive { name="ppiPre"; version="1.7"; sha256="12my8xqb3zbiji6z6ip079gh8rkfi700pbbj1acrnrcflxz2wqzx"; depends=[igraph e1071]; }; ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; }; pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; }; @@ -5031,6 +5055,7 @@ princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6a prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; }; probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; }; +probemod = derive { name="probemod"; version="0.1"; sha256="1i7hsnnwi20afhfzwmqyh1p7la71sqk49pb0wma80850psdzycdn"; depends=[]; }; probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; }; profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; @@ -5084,11 +5109,11 @@ pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzp pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; }; pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; }; pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[XML nnet httr]; }; -pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; }; +pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; }; pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; }; pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; }; -pxweb = derive { name="pxweb"; version="0.5.3"; sha256="0slqxn1yqss77c078adlmp4q4a08vd867gcz1nn7f61czb9wpf56"; depends=[data_table plyr stringr RJSONIO httr]; }; +pxweb = derive { name="pxweb"; version="0.5.5"; sha256="1rrsxis2fi1x90gj251phbrz3bbl7yyc39n20lk2rln14acdhfsy"; depends=[data_table plyr stringr RJSONIO httr]; }; pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; }; pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; }; qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; @@ -5120,7 +5145,7 @@ qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn1 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; }; qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; }; qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; }; -qtl = derive { name="qtl"; version="1.35-3"; sha256="1p679lalb50h8zsnb2439m3lsq6kh2fncw6k0kq5szcgm6zaxi94"; depends=[]; }; +qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; }; qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; }; qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; }; @@ -5137,7 +5162,7 @@ qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; }; quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; }; -quantmod = derive { name="quantmod"; version="0.4-3"; sha256="1x9h7ydifvs8mpcd4r83qz17pixxw1466262hh2j0xi259i1ds0k"; depends=[xts zoo TTR]; }; +quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; }; quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; }; quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; }; quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; }; @@ -5179,13 +5204,13 @@ rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxg rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; }; rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; }; -rNOMADS = derive { name="rNOMADS"; version="2.1.2"; sha256="1ww9jyzpk5r1glq407xz0ab80n0lj9gp4v4zfm2myfch3bjkcn9h"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; +rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; }; rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; }; rPref = derive { name="rPref"; version="0.4"; sha256="0w1cfcqngyympp8xh72rc2w7njjf0y4bilvmfiamp90ykv1yd0vn"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; }; rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; }; rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; }; rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; -rSPACE = derive { name="rSPACE"; version="1.0.4"; sha256="1vps3cf7szbkl87warp99fx4laivylwq3ihg8z7iincd2x072xgw"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; }; +rSPACE = derive { name="rSPACE"; version="1.1.0"; sha256="1kj6l41wdm2dqygwfdlfrys9idykjfj6vmv6pzbgp998a29fm53s"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; }; rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; }; rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; }; rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[stringr choroplethr rvest]; }; @@ -5203,7 +5228,7 @@ randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67g random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; }; random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; }; randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; }; -randomForestSRC = derive { name="randomForestSRC"; version="1.6.0"; sha256="1fd2hlihqkrx5cg91cfiibxw7h3gca5asf8a9nnm7ldafsamczy5"; depends=[]; }; +randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; }; randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; }; randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[lattice boot fastGHQuad]; }; randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; }; @@ -5244,9 +5269,9 @@ rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; }; rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; }; rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; }; -rclinicaltrials = derive { name="rclinicaltrials"; version="1.4"; sha256="1jh4jn52hcwbycvwvfn7wb1h0r7makkli3hvxg17dbalrxky9xgq"; depends=[httr XML plyr]; }; +rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; }; rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; }; -rcrossref = derive { name="rcrossref"; version="0.2.1"; sha256="19l3z2rfs1wj9z5myrskzbgsdpqya231wkiagvr6fynjdf2wcl9q"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; +rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; }; rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[zoo RCurl RJSONIO]; }; rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; }; @@ -5267,7 +5292,7 @@ rebmix = derive { name="rebmix"; version="2.7.0"; sha256="180kvij3aaxvqcbidfjir9 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; }; recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; }; reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; }; -recluster = derive { name="recluster"; version="2.7"; sha256="0kgq3bm5zh4iskm4ydpnsxmy9vcgxjk9iz7d1f1didlvxg3piys7"; depends=[vegan ape picante phangorn phytools cluster]; }; +recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[vegan ape picante phangorn phytools cluster]; }; recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; }; recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; }; recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; }; @@ -5304,7 +5329,7 @@ relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23f remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; }; remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; }; -rentrez = derive { name="rentrez"; version="0.4"; sha256="14v53b6z86isylc3fv5b23sl1lhn4rrmd8l4nfpjin1szzdzdx58"; depends=[XML httr jsonlite]; }; +rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; }; repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; }; replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; }; repmis = derive { name="repmis"; version="0.4"; sha256="0m54pif9sj1lf23wbykxlsab3q1b90bwz8cwkh2ibic6gyh5h4dg"; depends=[data_table digest httr plyr R_cache xlsx]; }; @@ -5465,6 +5490,7 @@ rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xr rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; }; rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsatscan = derive { name="rsatscan"; version="0.3.9122"; sha256="100098c5v8s3xcwvgx63fqi1ngyq5hc7l4wwklhw5zm7h30fcr7z"; depends=[foreign]; }; +rscala = derive { name="rscala"; version="1.0.2"; sha256="13l1cmmj28kjrmxnvgi5zpxi8ak9956bzmsn1b3v7a3xb6glchij"; depends=[]; }; rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; }; rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; }; @@ -5474,7 +5500,7 @@ rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; }; rsm = derive { name="rsm"; version="2.07"; sha256="0d1kymgmprp41xvax6c5k881dxjgf6bnvpl4mh9l1pnjdcq7pyi5"; depends=[]; }; rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[XML rgl]; }; -rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc4xlygf0kcd91sqg89nmprfw73j6c"; depends=[plyr stringr httr RCurl XML]; }; +rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; }; rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; }; rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; }; rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; }; @@ -5520,6 +5546,7 @@ sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive { name="saccades"; version="0.1"; sha256="0bmwqfhdqf4j0xpyfzzgl6h35r3wgjmkrmnwn9l17648f236d7c8"; depends=[zoom]; }; +sadists = derive { name="sadists"; version="0.1.0"; sha256="1qx0ki0w8i9w92phzcz57mm1kp4p2i5fznqvwa4amdqym66ky48c"; depends=[PDQutils hypergeo orthopolynom]; }; sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; }; sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; }; sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; @@ -5617,7 +5644,7 @@ semsfa = derive { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf sendmailR = derive { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; sensR = derive { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[multcomp MASS numDeriv]; }; -sensitivity = derive { name="sensitivity"; version="1.10.1"; sha256="1pszyf8lkp2jv773kfs1jmidq8dykiwhp592dnm4zhiy18sl7jl2"; depends=[boot]; }; +sensitivity = derive { name="sensitivity"; version="1.11"; sha256="197gm4ylh8giyh5iv9lf5dyb9ad7m406d08ai3vnf7irj7f8nwp2"; depends=[boot]; }; sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; }; sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; @@ -5665,7 +5692,7 @@ shinyFiles = derive { name="shinyFiles"; version="0.5.0"; sha256="0ax8blsflzwzzp shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; -shinythemes = derive { name="shinythemes"; version="1.0"; sha256="19qhbiyn8chchwj9w9vyi6q86l84amf2n0g5y310apw1hzsjnnr7"; depends=[shiny]; }; +shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; }; shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; }; shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; }; showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; }; @@ -5675,22 +5702,22 @@ shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2 siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[rsm MASS foreach doSNOW]; }; siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[hdrcde coda MASS bayesm mnormt spatstat]; }; sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; }; -sidier = derive { name="sidier"; version="3.0"; sha256="0jkb2iqlafxzar359fqh09kzfz7iy4kkmg8sp9f6ihyvy35dvh93"; depends=[ape network igraph gridBase ggmap ggplot2]; }; +sidier = derive { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape network igraph gridBase ggmap ggplot2]; }; sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; }; signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; }; -signal_hsmm = derive { name="signal.hsmm"; version="1.1"; sha256="0ifx7ahl5nj90id0pk4gpz0hdq72rsf53n05s17g6j275dzkmd0n"; depends=[seqinr shiny]; }; +signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; }; simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; }; -simMSM = derive { name="simMSM"; version="1.1.4"; sha256="0dxl0cinc8zz77jjk7qbj81x6c9b1mw07x9rr5qdqbj9vnaj0gzy"; depends=[survival mvna]; }; +simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; }; simPH = derive { name="simPH"; version="1.3"; sha256="1hazh1flag3n7mrab9agc6nmiii0amdcxlbgzadiwpgyrdbdhkjn"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; }; simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; }; simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; }; simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; }; simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; }; -simctest = derive { name="simctest"; version="2.4"; sha256="12qxav3qy1s6g8yr6ygbjp3jlrf2p0h3zvl8bnqpk6mx95zw5gh3"; depends=[]; }; +simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; }; simecol = derive { name="simecol"; version="0.8-4"; sha256="0k83zcnvxq89m60d9157w3sn2gwyl6m7812qy1bgn260ac2nqv10"; depends=[deSolve]; }; simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; @@ -5702,7 +5729,7 @@ simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; }; siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; }; sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; }; -sirt = derive { name="sirt"; version="1.3"; sha256="1m76jk45s60kzqasx5scq24lbn4mljdg8j8sxq9fs1r9yjz76f3k"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; +sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; }; sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh0h5f5wyry1cbi33rj3h7sss8vi3vz0"; depends=[lars]; }; sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; }; sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; }; @@ -5833,7 +5860,7 @@ spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lr spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; }; spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; }; spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; }; -spatstat = derive { name="spatstat"; version="1.40-0"; sha256="1pxmfh401zcssp10g3wcsbiq63vi4b9c95g3ir394m1hqf122qhc"; depends=[mgcv deldir abind tensor polyclip goftest]; }; +spatstat = derive { name="spatstat"; version="1.41-1"; sha256="1r2538h4arvlsn49ci84ch45wy5k9kiq4d22bd98jrh6xna3rd6x"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; }; spatsurv = derive { name="spatsurv"; version="0.9-8"; sha256="1dsqkcmhka8yzl13jfn19ywq1bk7788amj4nrl1bz05q3vz3drpp"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; }; spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; }; spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; }; @@ -5848,7 +5875,6 @@ spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq0 speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; }; speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; }; -spectral_methods = derive { name="spectral.methods"; version="0.7.2.125"; sha256="06d7l3hv1yi887yd3ig63n2ajyxa7a0cpjaza8spif9yj5jia35d"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; }; spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; }; speedglm = derive { name="speedglm"; version="0.2-1.0"; sha256="13gjij9pb65j9c52d5cxl9n6fjmcwbhja4wdl4619dy5rj9vsyi4"; depends=[Matrix]; }; speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; @@ -5923,13 +5949,15 @@ statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; }; stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; -stepR = derive { name="stepR"; version="1.0"; sha256="0sif4hrnxkpwimrlf6m3qdgk79vzca44apz0xqc0h647841n63ax"; depends=[]; }; +stepR = derive { name="stepR"; version="1.0-1"; sha256="1iafxg0g0cy6v98b85h68xrmfndc2hbmr9x7v5nk16zgcknl8k96"; depends=[]; }; stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; +stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; }; stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; }; stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; }; stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[matrixStats slam lda stringr Matrix glmnet]; }; +stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; }; stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; }; stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; stochvol = derive { name="stochvol"; version="1.0.0"; sha256="1c083gmfq9ldd41235shcb5i3ggd92fxvimhaavljnr1wsls5f2b"; depends=[coda Rcpp Rcpp]; }; @@ -5954,7 +5982,7 @@ stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; }; strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; }; structSSI = derive { name="structSSI"; version="1.1"; sha256="0rmf3q65adrqh9nrc4apqm4ca7frpwqr6xh80b4mxiz0z4wfcv9q"; depends=[igraph rjson ggplot2 reshape2]; }; -strum = derive { name="strum"; version="0.5.1"; sha256="1maws316zqhgvv2iq1iqhybxqx3rws9rnn7zxf07ksdxmqqqkcbj"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; +strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; }; strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; }; stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; }; stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; @@ -6102,11 +6130,11 @@ timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadf timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; -timereg = derive { name="timereg"; version="1.8.6"; sha256="02whk0wqd1n2dzsfqvhs4plgkvrj04r1i83lvsa2j2qwjvbf831p"; depends=[survival lava]; }; +timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g3p2xl3zbsfiak7lagvs5sbsq84b0wpr7"; depends=[survival lava numDeriv]; }; timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive { name="timeseriesdb"; version="0.1"; sha256="1zwvjnx4b020avyxjx2nwg9n8p8bdrn038mfcl53y9cnxj3w5wsq"; depends=[DBI]; }; timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; }; -timma = derive { name="timma"; version="1.2.0"; sha256="06ycki3x99nwaxqxbnw7h5b3sx6jznl1ahnzqw6vjyrl4dw6d1fl"; depends=[Rcpp QCA Rcpp RcppArmadillo]; }; +timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; }; timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; }; tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tis = derive { name="tis"; version="1.27"; sha256="1kgzc032qa005hzcimhbbhcs5kcvm88pfb48ac84k205f6xhdsir"; depends=[]; }; @@ -6122,7 +6150,7 @@ tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0w tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; }; tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.1"; sha256="1rjpnr3x9nngvbx3vlzqsha9zg7ikqfxmqsalb3gvgph0bamdbbp"; depends=[NLP tm XML]; }; tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; }; -tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.1"; sha256="1hx0micnma1i6bys6jhwcxjsb7rlzac5kwwnrsgk7i1ynq7bh3zp"; depends=[NLP tm XML ISOcodes]; }; +tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; }; tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; }; tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; }; @@ -6131,7 +6159,6 @@ tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99w tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; }; tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; }; tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; }; -toaster = derive { name="toaster"; version="0.2.5"; sha256="0yybv6lq22mzawyvywh1dpg5p5mx5qqqssdhgd3ff78cqp7j298r"; depends=[RODBC plyr reshape2 ggplot2 scales RColorBrewer wordcloud ggmap]; }; tolerance = derive { name="tolerance"; version="1.0.0"; sha256="1anim3rq60fscylnz066fddihrxzy0j0d09ni262fqhbc2fla0xy"; depends=[rgl]; }; topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; }; topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; }; @@ -6230,7 +6257,7 @@ urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; }; usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; }; useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; }; -userfriendlyscience = derive { name="userfriendlyscience"; version="0.1-2"; sha256="1b2ypga0kzf8qsl160by1vfp8p6z2mczn3w1qgk042y83kiaiawx"; depends=[ggplot2 plyr psych pwr fBasics e1071 ltm MBESS foreign knitr xtable GGally lavaan]; }; +userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-0"; sha256="01r66pykmjarcw2644yvzqizffck9nj78iq9dgxz1743nqnjld61"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; }; uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; }; usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; }; ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; }; @@ -6242,7 +6269,7 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; }; varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; }; vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; }; -vardpoor = derive { name="vardpoor"; version="0.2.6"; sha256="1csnvdpcllq1lrzq3xqhgbnrf3gdah011rknhbl5z67zwa8gs4w1"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; +vardpoor = derive { name="vardpoor"; version="0.2.8"; sha256="02gbj5d7qwj05cybr0rc6zx2308r35rh5dzcxms0b3ijzpl32bcs"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; }; vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; }; vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; }; vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; @@ -6294,6 +6321,7 @@ waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqh wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; }; wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; }; weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; +webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[XML RCurl RJSONIO]; }; webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; }; webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; }; @@ -6312,6 +6340,7 @@ wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi9 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; }; windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; }; witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; }; +wkb = derive { name="wkb"; version="0.1-0"; sha256="0ynamg8zrk80j5ysyg7pymdcxzlscbhhygp8czmsd33p2y31pggd"; depends=[sp]; }; wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; }; wmlf = derive { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; }; @@ -6333,11 +6362,11 @@ wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kpr wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; }; wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; }; wux = derive { name="wux"; version="1.2-3"; sha256="1hpgjs7jl4zckm87hrsnmqyvxg93aqsnrf79wisvs2wajgh73zmi"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; }; -x_ent = derive { name="x.ent"; version="1.0.6"; sha256="0yjg7gi8yhn7vw90i802dcrp6mln84rjlpcgnjvwq21s8nffs2z6"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2]; }; +x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; }; x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; }; xergm = derive { name="xergm"; version="1.4.1"; sha256="1lcqa2vxdg4ljk2p0m8cqw68bqxycxql57nr3n4ggic2ys0sbrxa"; depends=[statnet statnet_common network sna ergm texreg Matrix boot coda ROCR igraph vegan lme4 Rcpp speedglm Rcpp]; }; -xgboost = derive { name="xgboost"; version="0.3-2"; sha256="1sp0rl4ixdcqljcf12cc517vnwj851g88xla641nfl0qbcj8b7n7"; depends=[Matrix]; }; +xgboost = derive { name="xgboost"; version="0.3-3"; sha256="1cxwzarppxwh9hdbkxcg74bjazxgr5977ssngkj4h91wk6ij3rnk"; depends=[Matrix data_table magrittr stringr DiagrammeR ggplot2 Ckmeans_1d_dp vcd]; }; xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; }; @@ -6354,7 +6383,7 @@ yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11ms yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; }; ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; }; -yhatr = derive { name="yhatr"; version="0.13.2"; sha256="0065252bgn96g1z7ddkyfbnnahvvdgfx3lxrb51fk7bkbvxs2781"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; +yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr RCurl rjson plyr jsonlite stringr]; }; ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; }; yuima = derive { name="yuima"; version="1.0.36"; sha256="1rz96v0c9sikjvm3i8x887v1bkiixps691vclpd6i4cchyayx63h"; depends=[zoo expm cubature mvtnorm]; }; zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; }; @@ -6368,5 +6397,5 @@ zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lq zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; }; zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; -zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; +zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; } From a05aa1a3b1e5ca799f2d6220d7157708adede233 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 16:01:39 +0100 Subject: [PATCH 138/174] haskell-ng: update to latest hscolour --- .../haskell-modules/hackage-packages.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4eee51563d0..68ea13ab775 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -61306,7 +61306,7 @@ self: { "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, process + , directory, extra, filepath, haskell-src-exts, hscolour, process , transformers, uniplate }: mkDerivation { @@ -61317,7 +61317,7 @@ self: { isExecutable = true; buildDepends = [ ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts process transformers uniplate + filepath haskell-src-exts hscolour process transformers uniplate ]; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; @@ -64579,20 +64579,6 @@ self: { }) {}; "hscolour" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "hscolour"; - version = "1.20.3"; - sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base containers ]; - homepage = "http://code.haskell.org/~malcolm/hscolour/"; - description = "Colourise Haskell code"; - license = "GPL"; - }) {}; - - "hscolour_1_21" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; From e8b33876afec9b118c4e39204651ea3ead54bbc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 16:43:04 +0100 Subject: [PATCH 139/174] r-Cell: drop obsolete package --- pkgs/development/r-modules/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3dc8b0874ed..719f73348bc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -849,7 +849,6 @@ let "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges "RbioRXN" # requires fmcsR, and KEGGREST "RcppAPT" # configure script depends on /bin/sh - "Rcell" # requires EBImage "RcmdrPlugin_seeg" # requires seeg "Rcplex" # requires cplexAPI "RcppRedis" # requires Hiredis From a574065a81b2173ef319fd9d1830241285def1d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 16:23:23 +0100 Subject: [PATCH 140/174] =?UTF-8?q?nixos-rebuild:=20Add=20=E2=80=98dry-act?= =?UTF-8?q?ivate=E2=80=99=20command?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘nixos-rebuild dry-activate’ builds the new configuration and then prints what systemd services would be stopped, restarted etc. if the configuration were actually activated. This could be extended later to show other activation actions (like uids being deleted). To prevent confusion, ‘nixos-rebuild dry-run’ has been renamed to ‘nixos-rebuild dry-build’. --- nixos/doc/manual/man-nixos-rebuild.xml | 23 +++- .../modules/installer/tools/nixos-rebuild.sh | 11 +- .../activation/switch-to-configuration.pl | 125 ++++++++++++------ 3 files changed, 107 insertions(+), 52 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index afc159dbd5d..c529737c3bf 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -1,7 +1,7 @@ - + nixos-rebuild 8 @@ -22,7 +22,8 @@ - + + @@ -114,10 +115,22 @@ $ nix-build /path/to/nixpkgs/nixos -A system - + - Simply show what store paths would be built or downloaded - by any of the operations above. + Show what store paths would be built or downloaded by any + of the operations above, but otherwise do nothing. + + + + + + + Build the new configuration, but instead of activating it, + show what changes would be performed by the activation (i.e. by + nixos-rebuild test). For + instance, this command will print which systemd units would be + restarted. The list of changes is not guaranteed to be + complete. diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8157f8fc7da..1d6df8cb3f7 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -26,7 +26,8 @@ while [ "$#" -gt 0 ]; do --help) showSyntax ;; - switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader) + switch|boot|test|build|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader) + if [ "$i" = dry-run ]; then i=dry-build; fi action="$i" ;; --install-grub) @@ -137,7 +138,7 @@ fi # First build Nix, since NixOS may require a newer version than the # current one. -if [ -n "$rollback" -o "$action" = dry-run ]; then +if [ -n "$rollback" -o "$action" = dry-build ]; then buildNix= fi @@ -180,7 +181,7 @@ if [ -n "$canRun" ]; then fi -if [ "$action" = dry-run ]; then +if [ "$action" = dry-build ]; then extraBuildFlags+=(--dry-run) fi @@ -193,7 +194,7 @@ if [ -z "$rollback" ]; then if [ "$action" = switch -o "$action" = boot ]; then nix-env "${extraBuildFlags[@]}" -p "$profile" -f '' --set -A system pathToConfig="$profile" - elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then + elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then nix-build '' -A system -k "${extraBuildFlags[@]}" > /dev/null pathToConfig=./result elif [ "$action" = build-vm ]; then @@ -224,7 +225,7 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. -if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then +if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then if ! $pathToConfig/bin/switch-to-configuration "$action"; then echo "warning: error(s) occured while switching to the new configuration" >&2 exit 1 diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index dbe13c022f0..45fb752aaaa 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -9,19 +9,21 @@ use Cwd 'abs_path'; my $out = "@out@"; +# To be robust against interruption, record what units need to be started etc. my $startListFile = "/run/systemd/start-list"; my $restartListFile = "/run/systemd/restart-list"; my $reloadListFile = "/run/systemd/reload-list"; my $action = shift @ARGV; -if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test")) { +if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR < 1 }, "$unit\n") if $action ne "dry-activate"; +} + # As a fingerprint for determining whether a unit has changed, we use # its absolute path. If it has an override file, we append *its* # absolute path as well. @@ -124,9 +129,18 @@ sub fingerprintUnit { return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : ""); } -# Stop all services that no longer exist or have changed in the new -# configuration. -my (@unitsToStop, @unitsToSkip); +# Figure out what units need to be stopped, started, restarted or reloaded. +my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); + +$unitsToStart{$_} = 1 foreach + split('\n', read_file($startListFile, err_mode => 'quiet') // ""); + +$unitsToRestart{$_} = 1 foreach + split('\n', read_file($restartListFile, err_mode => 'quiet') // ""); + +$unitsToReload{$_} = 1 foreach + split '\n', read_file($reloadListFile, err_mode => 'quiet') // ""; + my $activePrev = getActiveUnits; while (my ($unit, $state) = each %{$activePrev}) { my $baseUnit = $unit; @@ -141,7 +155,7 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } elsif ($unit =~ /\.target$/) { @@ -155,7 +169,8 @@ while (my ($unit, $state) = each %{$activePrev}) { # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { - write_file($startListFile, { append => 1 }, "$unit\n"); + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); } } @@ -171,7 +186,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # (unless there is a PartOf dependency), so this is just a # bookkeeping thing to get systemd to do the right thing. if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) { - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } } @@ -180,16 +195,18 @@ while (my ($unit, $state) = each %{$activePrev}) { # Do nothing. These cannot be restarted directly. } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { - push @unitsToSkip, $unit; + $unitsToSkip{$unit} = 1; } else { # If this unit is socket-activated, then stop the # socket unit(s) as well, and restart the @@ -202,8 +219,9 @@ while (my ($unit, $state) = each %{$activePrev}) { } foreach my $socket (@sockets) { if (defined $activePrev->{$socket}) { - push @unitsToStop, $socket; - write_file($startListFile, { append => 1 }, "$socket\n"); + $unitsToStop{$unit} = 1; + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $socket); $socketActivated = 1; } } @@ -213,7 +231,8 @@ while (my ($unit, $state) = each %{$activePrev}) { # This unit should be restarted instead of # stopped and started. - write_file($restartListFile, { append => 1 }, "$unit\n"); + $unitsToRestart{$unit} = 1; + recordUnit($restartListFile, $unit); } else { @@ -222,10 +241,11 @@ while (my ($unit, $state) = each %{$activePrev}) { # We write this to a file to ensure that the # service gets restarted if we're interrupted. if (!$socketActivated) { - write_file($startListFile, { append => 1 }, "$unit\n"); + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); } - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } } @@ -268,14 +288,16 @@ foreach my $mountPoint (keys %$prevFss) { my $unit = pathToUnitName($mountPoint) . ".mount"; if (!defined $new) { # Filesystem entry disappeared, so unmount it. - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { # Filesystem type or device changed, so unmount and mount it. - write_file($startListFile, { append => 1 }, "$unit\n"); - push @unitsToStop, $unit; + $unitsToStop{$unit} = 1; + $unitsToStart{$unit} = 1; + recordUnit($startListFile, $unit); } elsif ($prev->{options} ne $new->{options}) { # Mount options changes, so remount it. - write_file($reloadListFile, { append => 1 }, "$unit\n"); + $unitsToReload{$unit} = 1; + recordUnit($reloadListFile, $unit); } } @@ -294,14 +316,36 @@ foreach my $device (keys %$prevSwaps) { # FIXME: update swap options (i.e. its priority). } -if (scalar @unitsToStop > 0) { - @unitsToStop = unique(@unitsToStop); - print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n"; - system("systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors? + +# Should we have systemd re-exec itself? +my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd"); + + +# Show dry-run actions. +if ($action eq "dry-activate") { + print STDERR "would stop the following units: ", join(", ", sort(keys %unitsToStop)), "\n" + if scalar(keys %unitsToStop) > 0; + print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" + if scalar(keys %unitsToSkip) > 0; + print STDERR "would restart systemd\n" if $restartSystemd; + print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" + if scalar(keys %unitsToRestart) > 0; + print STDERR "would start the following units: ", join(", ", sort(keys %unitsToStart)), "\n"; + print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" + if scalar(keys %unitsToReload) > 0; + exit 0; } -print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n" - if scalar @unitsToSkip > 0; + +syslog(LOG_NOTICE, "switching to system configuration $out"); + +if (scalar (keys %unitsToStop) > 0) { + print STDERR "stopping the following units: ", join(", ", sort(keys %unitsToStop)), "\n"; + system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? +} + +print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" + if scalar(keys %unitsToSkip) > 0; # Activate the new configuration (i.e., update /etc, make accounts, # and so on). @@ -310,7 +354,7 @@ print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; # Restart systemd if necessary. -if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) { +if ($restartSystemd) { print STDERR "restarting systemd...\n"; system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2; } @@ -327,10 +371,9 @@ system("@systemd@/bin/systemctl", "reload-or-restart", "dbus.service"); # Restart changed services (those that have to be restarted rather # than stopped and started). -my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // "")); -if (scalar @restart > 0) { - print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4; +if (scalar(keys %unitsToRestart) > 0) { + print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; + system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; unlink($restartListFile); } @@ -340,17 +383,15 @@ if (scalar @restart > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. -my @start = unique("default.target", "timers.target", "sockets.target", split('\n', read_file($startListFile, err_mode => 'quiet') // "")); -print STDERR "starting the following units: ", join(", ", sort(@start)), "\n"; -system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4; +print STDERR "starting the following units: ", join(", ", sort(keys %unitsToStart)), "\n"; +system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; unlink($startListFile); # Reload units that need it. This includes remounting changed mount # units. -my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // ""); -if (scalar @reload > 0) { - print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4; +if (scalar(keys %unitsToReload) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; + system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; unlink($reloadListFile); } From 475df1a3508925fad24564eb86386f8dee469405 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Mar 2015 16:45:01 +0100 Subject: [PATCH 141/174] switch-to-configuration: Don't print already active target units Since we restart all active target units (of which there are many), it's hard to see the units that actually matter. So don't print that we're starting target units that are already active. --- .../activation/switch-to-configuration.pl | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 45fb752aaaa..ce36bac2bdc 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -132,6 +132,8 @@ sub fingerprintUnit { # Figure out what units need to be stopped, started, restarted or reloaded. my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); +my %unitsToFilter; # units not shown + $unitsToStart{$_} = 1 foreach split('\n', read_file($startListFile, err_mode => 'quiet') // ""); @@ -171,6 +173,8 @@ while (my ($unit, $state) = each %{$activePrev}) { unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); + # Don't spam the user with target units that always get started. + $unitsToFilter{$unit} = 1; } } @@ -321,16 +325,30 @@ foreach my $device (keys %$prevSwaps) { my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd"); +sub filterUnits { + my ($units) = @_; + my @res; + foreach my $unit (sort(keys %{$units})) { + push @res, $unit if !defined $unitsToFilter{$unit}; + } + return @res; +} + +my @unitsToStopFiltered = filterUnits(\%unitsToStop); +my @unitsToStartFiltered = filterUnits(\%unitsToStart); + + # Show dry-run actions. if ($action eq "dry-activate") { - print STDERR "would stop the following units: ", join(", ", sort(keys %unitsToStop)), "\n" - if scalar(keys %unitsToStop) > 0; + print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n" + if scalar @unitsToStopFiltered > 0; print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" if scalar(keys %unitsToSkip) > 0; print STDERR "would restart systemd\n" if $restartSystemd; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; - print STDERR "would start the following units: ", join(", ", sort(keys %unitsToStart)), "\n"; + print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" + if scalar @unitsToStartFiltered; print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" if scalar(keys %unitsToReload) > 0; exit 0; @@ -340,7 +358,8 @@ if ($action eq "dry-activate") { syslog(LOG_NOTICE, "switching to system configuration $out"); if (scalar (keys %unitsToStop) > 0) { - print STDERR "stopping the following units: ", join(", ", sort(keys %unitsToStop)), "\n"; + print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" + if scalar @unitsToStopFiltered; system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? } @@ -383,7 +402,8 @@ if (scalar(keys %unitsToRestart) > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. -print STDERR "starting the following units: ", join(", ", sort(keys %unitsToStart)), "\n"; +print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" + if scalar @unitsToStartFiltered; system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; unlink($startListFile); From 8a970b0b28b9d20ff7569bb6590593e2b8635a29 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 9 Mar 2015 08:51:45 -0700 Subject: [PATCH 142/174] emacs24PackagesNg: add recurseIntoAttrs to trigger hydra --- 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 d02a677b1ea..8baee1d2c1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10197,7 +10197,7 @@ let }; }; - emacs24PackagesNg = emacsPackagesNgGen emacs24; + emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); inherit (gnome3) empathy; From 19a6e3a2e6a4532bc25da58053e4144d3ef58a80 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 9 Mar 2015 09:19:36 -0700 Subject: [PATCH 143/174] emacs24PackagesNg: fix typos in "license" --- pkgs/top-level/emacs-packages.nix | 108 +++++++++++++++--------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 680ec72ed5c..57d5410a3bf 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -24,7 +24,7 @@ , external }@args: -with lib.licences; +with lib.licenses; let self = _self // overrides; callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); @@ -42,7 +42,7 @@ let self = _self // overrides; sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm"; }; packageRequires = [ auto-complete haskell-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; ace-jump-mode = melpaBuild rec { @@ -56,7 +56,7 @@ let self = _self // overrides; }; meta = { description = "Advanced cursor movements mode for Emacs"; - licence = gpl3Plus; + license = gpl3Plus; }; }; @@ -70,7 +70,7 @@ let self = _self // overrides; sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k"; }; packageRequires = [ dash s ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; agda2-mode = with external; trivialBuild { @@ -149,7 +149,7 @@ let self = _self // overrides; rev = "v${version}"; sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; auctex = melpaBuild rec { @@ -162,7 +162,7 @@ let self = _self // overrides; buildPhase = '' cp $src ${pname}-${version}.tar ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; auto-complete = melpaBuild rec { @@ -193,7 +193,7 @@ let self = _self // overrides; sha256 = "1m4v5h52brg2g9rpbqfq9m3m8fv520vg5mjwppnbw6099d17msqd"; }; files = [ "bind-key.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; browse-kill-ring = melpaBuild rec { @@ -222,7 +222,7 @@ let self = _self // overrides; sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq"; }; packageRequires = [ expand-region ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; circe = melpaBuild rec { @@ -236,7 +236,7 @@ let self = _self // overrides; }; packageRequires = [ lcs lui ]; fileSpecs = [ "lisp/circe*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; company = melpaBuild rec { @@ -248,7 +248,7 @@ let self = _self // overrides; rev = version; sha256 = "1xwxyqg5dan8m1qkdxyzm066ryf24h07karpdlm3s09izfdny33f"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; dash = melpaBuild rec { @@ -260,7 +260,7 @@ let self = _self // overrides; rev = version; sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; diminish = melpaBuild rec { @@ -272,7 +272,7 @@ let self = _self // overrides; rev = version; sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; epl = melpaBuild rec { @@ -284,7 +284,7 @@ let self = _self // overrides; rev = "63c78c08e345455f3d4daa844fdc551a2c18024e"; sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; evil-god-state = melpaBuild rec { @@ -297,7 +297,7 @@ let self = _self // overrides; sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy"; }; packageRequires = [ evil god-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; evil-surround = melpaBuild rec { @@ -312,7 +312,7 @@ let self = _self // overrides; packageRequires = [ evil ]; meta = { description = "surround.vim emulation for Emacs evil mode"; - licence = gpl3Plus; + license = gpl3Plus; }; }; @@ -327,7 +327,7 @@ let self = _self // overrides; packageRequires = [ goto-chg undo-tree ]; meta = { description = "Extensible vi layer for Emacs"; - licence = gpl3Plus; + license = gpl3Plus; }; }; @@ -340,7 +340,7 @@ let self = _self // overrides; rev = "e4af0e9b44738e7474c89ed895200b42e6541515"; sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; expand-region = melpaBuild rec { @@ -354,7 +354,7 @@ let self = _self // overrides; }; meta = { description = "Increases the selected region by semantic units in Emacs"; - licence = gpl3Plus; + license = gpl3Plus; }; }; @@ -384,7 +384,7 @@ let self = _self // overrides; sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp"; }; packageRequires = [ flycheck popup ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; flycheck = melpaBuild rec { @@ -397,7 +397,7 @@ let self = _self // overrides; sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a"; }; packageRequires = [ dash pkg-info ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; ghc-mod = melpaBuild rec { @@ -405,7 +405,7 @@ let self = _self // overrides; version = external.ghc-mod.version; src = external.ghc-mod.src; fileSpecs = [ "elisp/*.el" ]; - meta = { licence = bsd3; }; + meta = { license = bsd3; }; }; git-commit-mode = melpaBuild rec { @@ -418,7 +418,7 @@ let self = _self // overrides; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-commit-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; git-rebase-mode = melpaBuild rec { @@ -431,7 +431,7 @@ let self = _self // overrides; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "git-rebase-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitattributes-mode = melpaBuild rec { @@ -444,7 +444,7 @@ let self = _self // overrides; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitattributes-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitconfig-mode = melpaBuild rec { @@ -457,7 +457,7 @@ let self = _self // overrides; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitconfig-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gitignore-mode = melpaBuild rec { @@ -470,7 +470,7 @@ let self = _self // overrides; sha256 = "1x03276yq63cddc89n8i47k1f6p26b7a5la4hz66fdf15gmr8496"; }; files = [ "gitignore-mode.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; gnus = melpaBuild rec { @@ -485,7 +485,7 @@ let self = _self // overrides; preBuild = '' (cd lisp && make gnus-load.el) ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; god-mode = melpaBuild rec { @@ -497,7 +497,7 @@ let self = _self // overrides; rev = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6"; sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; goto-chg = melpaBuild rec { @@ -509,7 +509,7 @@ let self = _self // overrides; sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; }; files = [ "lib/goto-chg.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; haskell-mode = melpaBuild rec { @@ -521,7 +521,7 @@ let self = _self // overrides; rev = "0db5efaaeb3b22e5a3fdafa600729e14c1716ee2"; sha256 = "0d63cgzj579cr8zbrnl0inyy35b26sxinqxr7bgrjsngpmhm52an"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; helm-swoop = melpaBuild rec { @@ -534,7 +534,7 @@ let self = _self // overrides; sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; }; packageRequires = [ helm ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; helm = melpaBuild rec { @@ -547,7 +547,7 @@ let self = _self // overrides; sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay"; }; packageRequires = [ async ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; hi2 = melpaBuild rec { @@ -559,7 +559,7 @@ let self = _self // overrides; rev = version; sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; ido-ubiquitous = melpaBuild rec { @@ -588,7 +588,7 @@ let self = _self // overrides; sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb"; }; packageRequires = [ flycheck ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; lcs = melpaBuild rec { @@ -601,7 +601,7 @@ let self = _self // overrides; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/lcs*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; lui = melpaBuild rec { @@ -615,7 +615,7 @@ let self = _self // overrides; }; packageRequires = [ tracking ]; fileSpecs = [ "lisp/lui*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; magit = melpaBuild rec { @@ -628,7 +628,7 @@ let self = _self // overrides; sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; }; packageRequires = [ git-commit-mode git-rebase-mode ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; markdown-mode = melpaBuild rec { @@ -640,7 +640,7 @@ let self = _self // overrides; rev = "v${version}"; sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; @@ -655,7 +655,7 @@ let self = _self // overrides; buildPhase = '' cp $src ${pname}-${version}.tar ''; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; pkg-info = melpaBuild rec { @@ -668,7 +668,7 @@ let self = _self // overrides; sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p"; }; packageRequires = [ epl ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; popup = melpaBuild rec { @@ -680,7 +680,7 @@ let self = _self // overrides; rev = "v${version}"; sha256 = "0836ayyz1syvd9ry97ya06l8mpr88c6xbgb4d98szj6iwbypcj7b"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; projectile = melpaBuild rec { @@ -693,7 +693,7 @@ let self = _self // overrides; sha256 = "10c28h2g53sg68lwamhak0shdhh26h5xaipipz3n4281sr1fwg58"; }; packageRequires = [ dash helm s pkg-info epl ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; rich-minority = melpaBuild rec { @@ -706,7 +706,7 @@ let self = _self // overrides; sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k"; }; packageRequires = [ dash ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; s = melpaBuild rec { @@ -718,7 +718,7 @@ let self = _self // overrides; rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; semi = melpaBuild rec { @@ -747,7 +747,7 @@ let self = _self // overrides; sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24"; }; fileSpecs = [ "lisp/shorten*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; smart-mode-line = melpaBuild rec { @@ -760,7 +760,7 @@ let self = _self // overrides; sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6"; }; packageRequires = [ dash rich-minority ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; smartparens = melpaBuild rec { @@ -773,7 +773,7 @@ let self = _self // overrides; sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc"; }; packageRequires = [ dash ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; smex = melpaBuild rec { @@ -816,7 +816,7 @@ let self = _self // overrides; rev = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5"; sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; tracking = melpaBuild rec { @@ -830,7 +830,7 @@ let self = _self // overrides; }; packageRequires = [ shorten ]; fileSpecs = [ "lisp/tracking*.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; undo-tree = melpaBuild rec { @@ -841,7 +841,7 @@ let self = _self // overrides; rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; use-package = melpaBuild rec { @@ -855,7 +855,7 @@ let self = _self // overrides; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; volatile-highlights = melpaBuild rec { @@ -867,7 +867,7 @@ let self = _self // overrides; rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; wanderlust = melpaBuild rec { @@ -904,7 +904,7 @@ let self = _self // overrides; rm weechat-sauron.el weechat-secrets.el ''; packageRequires = [ s ]; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; wgrep = melpaBuild rec { @@ -916,7 +916,7 @@ let self = _self // overrides; rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; }; - meta = { licence = gpl3Plus; }; + meta = { license = gpl3Plus; }; }; }; in self From 78ec3797ab607901c30e194d60f308c0b8e5013f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 17:41:59 +0100 Subject: [PATCH 144/174] netsniff-ng: remove useless dependencies - Replace external `which` with `command -v` built into bash - Remove non-functional GeoIP dependency for now --- pkgs/tools/networking/netsniff-ng/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e9a0157b123..f192e8dba15 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet +{ stdenv, fetchFromGitHub, bison, flex, libcli, libnet , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, which, zlib }: +, pkgconfig, zlib }: stdenv.mkDerivation rec { version = "0.5.9-rc4-40-g5107740"; @@ -13,12 +13,13 @@ stdenv.mkDerivation rec { sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; }; - buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack - libpcap libsodium liburcu ncurses perl pkgconfig which zlib ]; + buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack + libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' patchShebangs configure + substituteInPlace configure --replace "which" "command -v" NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure ''; From 8aec000495d23652708d0478a1303d83c48b319f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 17:31:47 +0100 Subject: [PATCH 145/174] zim: fixed xdg path (closes #4786) --- pkgs/applications/office/zim/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 85ec081ea41..ac8059fc1d1 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -74,10 +74,13 @@ buildPythonPackage rec { # path to the executable in argv[0] therefore the wrapper is # modified accordingly. postFixup = '' + wrapProgram "$out/bin/zim" \ + --prefix XDG_DATA_DIRS : "$out/share" + wrapPythonPrograms - sed -i "s#sys\.argv\[0\] = 'zim'#sys.argv[0] = '$out/bin/zim'#g" \ - $out/bin/.zim-wrapped + sed -i "s#sys\.argv\[0\] = '.zim-wrapped'#sys.argv[0] = '$out/bin/zim'#g" \ + $out/bin/..zim-wrapped-wrapped if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages From 1d92bdd1ffd301199078208a4d8082ab80ac7e12 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Mon, 9 Mar 2015 09:43:14 -0700 Subject: [PATCH 146/174] help2man: more permissive meta.platforms --- pkgs/development/tools/misc/help2man/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d8d4f9bcd7..088e1574ebe 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; license = licenses.gpl3Plus; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; } From a9719f9dbb1c8cbc77a3588b58c70238a0febf3b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 17:48:54 +0100 Subject: [PATCH 147/174] global: update from 6.2.12 to 6.3.4 --- pkgs/development/tools/misc/global/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7d46b005919..e6169c48a44 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtool, ncurses }: stdenv.mkDerivation rec { - name = "global-6.2.12"; + name = "global-6.3.4"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "05jkhya1cs6yqhkf8nw5x56adkxxrqyga7sq7hx44dbf7alczwfa"; + sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; }; buildInputs = [ libtool ncurses ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -v *.el "$out/share/emacs/site-lisp" ''; - meta = { + meta = with stdenv.lib; { description = "Source code tag system"; longDescription = '' @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } From 3b1b8fb6296e2889c334447c1b83e698582f5349 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 18:27:25 +0100 Subject: [PATCH 148/174] antiword: apply debians patch for CVE-2014-8123 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771768 --- .../10_fix_buffer_overflow_wordole_c.patch | 18 ++++++++++++++++++ pkgs/applications/office/antiword/default.nix | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch new file mode 100644 index 00000000000..ebf2f0900d9 --- /dev/null +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch @@ -0,0 +1,18 @@ +Description: Add check for buffer overflow with malformed input files +Author: +Bug-Debian: http://bugs.debian.org/407015 +Last-Update: 2009-06-03 + +--- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 ++++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 +@@ -259,6 +259,10 @@ + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { ++ werr(0, "Name Size of PPS %d is too large", iIndex); ++ tNameSize = sizeof(atPPSlist[iIndex].szName); ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index f889490a862..ea36d59eea7 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation { sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; - patchPhase = '' + preInstall = '' sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h ''; + patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + installTargets = "global_install"; meta = { From af0f1840b47ac3f666401da56538e6f1ffccd57f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 18:35:25 +0100 Subject: [PATCH 149/174] utf8proc: fixed description --- pkgs/development/libraries/utf8proc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 803666b4246..8c715fbd928 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "utf8proc is a library for processing UTF-8 encoded Unicode strings"; + description = "A library for processing UTF-8 encoded Unicode strings"; homepage = http://www.public-software-group.org/utf8proc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; From 3a32dae7995895521bfd54e3b1ffa14209a106fb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Mar 2015 18:37:30 +0100 Subject: [PATCH 150/174] update rust to new nightly (2015-03-09) --- pkgs/development/compilers/rustc/head.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 5669b15a700..2d450388669 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,15 +2,15 @@ callPackage ./makeRustcDerivation.nix { shortVersion = "1.0.0-dev"; isRelease = false; - # src rev for master on 2015/03/01 - srcRev = "157614249594f187f421cd97f928e64c5ab5c1fa"; - srcSha = "06d6fwl1dg6wfnwa002ak89hnjplpf2sjhg78yjg4ki0ca7b0b74"; - snapshotHashLinux686 = "3278ebbce8cb269acc0614dac5ddac07eab6a99c"; - snapshotHashLinux64 = "72287d0d88de3e5a53bae78ac0d958e1a7637d73"; - snapshotHashDarwin686 = "33b366b5287427a340a0aa6ed886d5ff4edf6a76"; - snapshotHashDarwin64 = "914bf9baa32081a9d5633f1d06f4d382cd71504e"; - snapshotDate = "2015-02-25"; - snapshotRev = "880fb89"; + # src rev for master on 2015/03/09 + srcRev = "91bdf23f504f79ed59617cde3dfebd3d5e39a476"; + srcSha = "1s1v1q630d88idz331n4m0c3ninzipmvfzmkvdaqqm28wsn69xx7"; + snapshotHashLinux686 = "50a47ef247610fb089d2c4f24e4b641eb0ba4afb"; + snapshotHashLinux64 = "ccb20709b3c984f960ddde996451be8ce2268d7c"; + snapshotHashDarwin686 = "ad263bdeadcf9bf1889426e0c1391a7cf277364e"; + snapshotHashDarwin64 = "01c8275828042264206b7acd8e86dc719a2f27aa"; + snapshotDate = "2015-03-07"; + snapshotRev = "270a677"; patches = [ ./patches/head.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; From a63d87cba840b5825fa425cacac11d39a351063f Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 19:26:35 +0100 Subject: [PATCH 151/174] autossh: update from 1.4d to 1.4e --- pkgs/tools/networking/autossh/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 8c85d99f217..5addf30c322 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: -stdenv.mkDerivation { - name = "autossh-1.4d"; +stdenv.mkDerivation rec { + name = "autossh-1.4e"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4d.tgz"; - sha256 = "05nwvqfyk0kbalwabj4z3xx11i0qdqg6xadzk17ckr5xb3j8y000"; + url = "http://www.harding.motd.ca/autossh/${name}.tgz"; + sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly"; }; buildInputs = [ openssh ]; @@ -20,9 +20,10 @@ stdenv.mkDerivation { install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } From 070808283b1777edab5dac4ef9dd22df4a071c7d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 19:27:59 +0100 Subject: [PATCH 152/174] cpuminer: update from 2.4 to 2.4.1 --- pkgs/tools/misc/cpuminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 57bd21dff23..0ca95127f11 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4"; + version = "2.4.1"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "0yl3ca31ck732f4551svxw6lx1lrjr7rhld5v09v0bgm3z07nnrx"; + sha256 = "0grj0swh1q3c3bj3yxji80yhxb09yz62x1n5h8z7c3azq4rrv2w1"; }; buildInputs = [ curl jansson ]; From 362f2db25887d542eff2b938b2bb4a3eaebef268 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 9 Mar 2015 19:32:00 +0100 Subject: [PATCH 153/174] findbugs: update from 3.0.0 to 3.0.1 --- pkgs/development/tools/analysis/findbugs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index fb7d8e74e45..aab47dadc90 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "findbugs-3.0.0"; +stdenv.mkDerivation rec { + name = "findbugs-3.0.1"; src = fetchurl { - url = mirror://sourceforge/findbugs/findbugs-3.0.0.tar.gz; - sha256 = "0csz6drzdz867r2p2wa4cvick6bv9dpz2yym9wrvp3fnxabmgiri"; + url = "mirror://sourceforge/findbugs/${name}.tar.gz"; + sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8"; }; buildPhase = '' @@ -34,8 +34,9 @@ stdenv.mkDerivation { EOF ''; - meta = { + meta = with stdenv.lib; { description = "A static analysis tool to find bugs in Java programs automatically"; homepage = http://findbugs.sourceforge.net/; + maintainers = with maintainers; [ pSub ]; }; } From 8cd6d53930dcde2e4bfe79f449916de6847daa6c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 9 Mar 2015 02:14:19 +0100 Subject: [PATCH 154/174] kbd: Patch in support for the Neo keyboard layout. This adds support for the Neo keyboard layout (http://neo-layout.org/, a layout optimized for the German language) for the native Linux console. It also adds build dependencies on autotools and friends, because we need to recreate the automake config in order to include a new keyboard layout directory. Signed-off-by: aszlig --- pkgs/os-specific/linux/kbd/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 2355fec1b52..673ad5d3165 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gzip, bzip2 }: +{ stdenv, fetchurl, autoconf, automake, libtool, gzip, bzip2 }: stdenv.mkDerivation rec { name = "kbd-1.15.3"; @@ -14,10 +14,24 @@ stdenv.mkDerivation rec { sha256 = "0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50"; }; + neoSrc = fetchurl { + name = "neo.map"; + url = "https://svn.neo-layout.org/linux/console/neo.map?r=2455"; + sha256 = "1wlgp09wq84hml60hi4ls6d4zna7vhycyg40iipyh1279i91hsx7"; + }; + configureFlags = "--disable-nls"; + preConfigure = '' + sh autogen.sh + ''; + patchPhase = '' + mkdir -p data/keymaps/i386/neo + cat "$neoSrc" > data/keymaps/i386/neo/neo.map + sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in + # Add the dvp keyboard in the dvorak folder ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map @@ -33,6 +47,8 @@ stdenv.mkDerivation rec { ''} ''; + buildInputs = [ autoconf automake libtool ]; + makeFlags = "setowner= "; meta = { From a1440a679dc81f610d2083296031af9818754983 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 23:01:32 +0300 Subject: [PATCH 155/174] primus: remove old workaround, fix LD_LIBRARY_PATH --- pkgs/tools/X11/primus/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 684713bebb1..c5c0e3ce780 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -14,12 +14,7 @@ let ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); primusrun = writeScript "primusrun" '' - export LD_LIBRARY_PATH=${ldPath}:\$LD_LIBRARY_PATH - # see: https://github.com/amonakov/primus/issues/138 - # On my system, as of 3.16.6, the intel driver dies when the pixel buffers try to read from the - # source memory directly. Setting PRIMUS_UPLOAD causes an indirection through textures which - # avoids this issue. - export PRIMUS_UPLOAD=1 + export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" ''; in From c16188343af7192bd51971ca07b5b4b00ed7b952 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 23:01:43 +0300 Subject: [PATCH 156/174] steam: add primus support --- pkgs/games/steam/chrootenv.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index d66a2a2ab69..b4019f86e30 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ buildFHSUserEnv, config }: +{ lib, buildFHSUserEnv, config }: buildFHSUserEnv { name = "steam"; @@ -14,7 +14,8 @@ buildFHSUserEnv { pkgs.gnome2.zenity pkgs.xdg_utils ] - ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ]) + ++ lib.optional (config.steam.java or false) pkgs.jdk + ++ lib.optional (config.steam.primus or false) pkgs.primus ; multiPkgs = pkgs: From d388855731394b848c62dfaf563d87cbd76d63d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Mar 2015 20:39:23 +0100 Subject: [PATCH 157/174] r-SID: mark broken --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 719f73348bc..f905459d648 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -893,6 +893,7 @@ let "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat + "SID" # requires pcalg "SimRAD" # requires Biostrings, and ShortRead "SimSeq" # requires edgeR "siplab" # requires spatstat From 9631f5a7183cfdd8975e03d741a1a49f0100ef94 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 15:16:03 -0700 Subject: [PATCH 158/174] gnupg: Fix default path to pcsclite --- pkgs/tools/security/gnupg/20.nix | 3 ++- pkgs/tools/security/gnupg/21.nix | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 0fcf334bee0..eab156c3266 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, libiconv +, libksba, coreutils, libiconv, pcsclite # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' '' + '' diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b9f212de26b..cebb61e62d5 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null , zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext +, pcsclite }: with stdenv.lib; @@ -14,6 +15,10 @@ stdenv.mkDerivation rec { patches = [ ./socket-activate-2.1.1.patch ]; + postPatch = '' + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; + buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 From e1703a836eae7e039e705986b93d7db3fb250515 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 15:22:44 -0700 Subject: [PATCH 159/174] gnupg: 2.0.26 -> 2.0.27 --- pkgs/tools/security/gnupg/20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index eab156c3266..10f4b587861 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "gnupg-2.0.26"; + name = "gnupg-2.0.27"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"; + sha256 = "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"; }; buildInputs From e61c7ad9011466248b8fd3ae930a3a964cfe4b2c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 9 Mar 2015 23:29:14 +0100 Subject: [PATCH 160/174] Bump development versions of Disnix --- .../package-management/disnix/DisnixWebService/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 50c421ba41e..16f90ec5ca2 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20173679/download/4/DisnixWebService-0.3.tar.bz2; - sha256 = "0gm8a4ijhydlij9byz2jvb925xzg8a7wbr9cnlf3b7r7zibi0sfy"; + url = http://hydra.nixos.org/build/20213076/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "0m3hk8nfgfnmd503pkpb6n2z944haq2n22d44q6n6zzqnfkjm175"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 04741b984fb..ee1e70a8582 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797"; + name = "disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7"; src = fetchurl { - url = http://hydra.nixos.org/build/20137290/download/4/disnix-0.3precd3288b47c8e7205268d6afb066e21b9d114f797.tar.gz; - sha256 = "1n1m4kr9xp60kkrcx92npc6hh3gi36njzxmds7nw9mz0pccqbci1"; + url = http://hydra.nixos.org/build/20213001/download/4/disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7.tar.gz; + sha256 = "08f16gi8dg39ll5ph6rs4wdw9dg4sdgnikpg1x40slzcrckvnkhm"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 656a491a254..4e8f7cc17ec 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909"; + name = "disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add"; src = fetchurl { - url = http://hydra.nixos.org/build/20173386/download/3/disnixos-0.2preead7dea88dedeb844450afc1f78bb58bd16ac909.tar.gz; - sha256 = "08bkr9lpbfkz0irp4x4v2rgpn6jmm1i6vb29sbnrjdv755yh8q81"; + url = http://hydra.nixos.org/build/20213021/download/3/disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add.tar.gz; + sha256 = "1dc9q8i9vhw0851w9b7giv570rly172mmqfr6khr2r88npc642xc"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 64066ed0fff..340a7704d7c 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f"; + name = "dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d"; src = fetchurl { - url = http://hydra.nixos.org/build/20131278/download/1/dysnomia-0.3pre87657a43630ffcb9396261d3874b8fd1a89f4c9f.tar.gz; - sha256 = "0dv7ivph2v5j4g5fqdrllxyzmp1hwnsd22n1s61qpkzb6qxaywjj"; + url = http://hydra.nixos.org/build/20212674/download/1/dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d.tar.gz; + sha256 = "0z41gxh3idlfardm5hwy65qxy7drrbcl3dndinr2qksqx4yjafi1"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 2eacaa856b71035607041587641037b58914546a Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Tue, 10 Mar 2015 00:19:10 +0100 Subject: [PATCH 161/174] haskell-uhc: Remove explicit dependency on binary --- pkgs/development/compilers/uhc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index b3126c6604b..ce3f805bec3 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -1,9 +1,9 @@ { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, shuffle, - binary, hashable, mtl, network, uhc-util, uulib + hashable, mtl, network, uhc-util, uulib }: -let wrappedGhc = ghcWithPackages ( self: [binary hashable mtl network uhc-util uulib] ); +let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { version = "1.1.8.7"; name = "uhc-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79423f3f4d6..cdd2318a670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3514,7 +3514,7 @@ let uhc = callPackage ../development/compilers/uhc/default.nix ({ stdenv = clangStdenv; ghcWithPackages = haskellngPackages.ghcWithPackages; - inherit (haskellngPackages) shuffle binary hashable mtl network uhc-util uulib; + inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib; }); gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { From b0bfff28c93275d4b59926e83b4972360562b303 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 16:55:44 -0700 Subject: [PATCH 162/174] libgpg-error: 1.17 -> 1.18 --- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8f41f24cae4..586d48a8daa 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libgpg-error-1.17"; + name = "libgpg-error-1.18"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1dapxzxl1naghf342fwfc2w2f2c5hb9gr1a1s4n8dsqn26kybx1z"; + sha256 = "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; From 3198caae45d47b0616a5d9694721582604c53b5a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 16:55:57 -0700 Subject: [PATCH 163/174] libgcrypt: 1.6.2 -> 1.6.3 --- pkgs/development/libraries/libgcrypt/1.6.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index e468c3163d3..39160675a2a 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }: stdenv.mkDerivation rec { - name = "libgcrypt-1.6.2"; + name = "libgcrypt-1.6.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c"; + sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21"; }; nativeBuildInputs = [ transfig ghostscript texinfo ]; @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - # For some reason the tests don't find `libgpg-error.so'. - checkPhase = '' - LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \ - make check - ''; - crossAttrs = let isCross64 = stdenv.cross.config == "x86_64-w64-mingw32"; in stdenv.lib.optionalAttrs isCross64 { From f227f36f449a6f5cedaf7c385c65f805040af7c7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 16:57:32 -0700 Subject: [PATCH 164/174] libyubikey: 1.12 -> 1.13 --- pkgs/development/libraries/libyubikey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 9d71c33cb30..8d3dd65adbf 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libyubikey-1.12"; + name = "libyubikey-1.13"; src = fetchurl { url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz"; - sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; + sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; }; meta = with stdenv.lib; { From 73f3432fbbb9c58f63a6b8d5745327c6a34651ea Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 17:01:31 -0700 Subject: [PATCH 165/174] firmware-linux-nonfree: 2015-02-27 -> 2015-03-09 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 06670b61b4b..be3d6a997b3 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "firmware-linux-nonfree-2015-02-27"; + name = "firmware-linux-nonfree-2015-03-09"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "cef33368c4d3425f11306496f0250f8ef1cf3c1f"; - sha256 = "0az6b7fbhanqdc9v9dl651yqqnfbm1npdibip196vnmd5qlv2iw4"; + rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; + sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; }; preInstall = '' From e76d7e7b537a76181d576aac64aaaab7852f8d82 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 17:33:37 -0700 Subject: [PATCH 166/174] lightdm-gtk-greeter: 1.6.1 -> 2.0.0 --- .../lightdm-gtk-greeter/default.nix | 35 ++++++++++--------- .../lightdm-gtk-greeter.patch | 13 ------- 2 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 69f1eef9cec..3ad367dc058 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -9,32 +9,34 @@ #ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory let - ver_branch = "1.6"; - version = "1.6.1"; + ver_branch = "2.0"; + version = "2.0.0"; in stdenv.mkDerivation rec { name = "lightdm-gtk-greeter-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz"; + sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc"; }; - patches = [ - ./lightdm-gtk-greeter.patch - (fetchurl { # CVE-2014-0979, https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1266449 - url = "https://launchpadlibrarian.net/161796033/07_fix-NULL-username.patch"; - sha256 = "1sqkhsz1z10k6vlmlrqrfx452lznv30885fmnzc73p2zxdlw9q1a"; - }) - ]; - patchFlags = "-p1"; - buildInputs = [ pkgconfig lightdm intltool ] ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); - configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2"; + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + + installFlags = [ "DESTDIR=\${out}" ]; postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" '' + stdenv.lib.optionalString useGTK2 '' @@ -42,9 +44,10 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ''; - meta = { + meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm-gtk-greeter; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; }; } diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch b/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch deleted file mode 100644 index ea9e0eaec93..00000000000 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c -index cc5f9e1..d615dc1 100644 ---- a/src/lightdm-gtk-greeter.c -+++ b/src/lightdm-gtk-greeter.c -@@ -1716,7 +1716,7 @@ main (int argc, char **argv) - gtk_container_add (GTK_CONTAINER (menuitem), image); - gtk_widget_show (GTK_WIDGET (menuitem)); - -- items = lightdm_get_sessions (); -+ items = lightdm_get_sessions (greeter); - GSList *sessions = NULL; - for (item = items; item; item = item->next) - { From 23194559f3ce9ede82b81d00359725e3f1312949 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 17:32:49 -0700 Subject: [PATCH 167/174] lightdm: 1.8.6 -> 1.13.1 --- .../display-managers/lightdm/default.nix | 41 +++-- .../display-managers/lightdm/lightdm.patch | 144 ------------------ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 34 insertions(+), 158 deletions(-) delete mode 100644 pkgs/applications/display-managers/lightdm/lightdm.patch diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index d4c6f24d69a..b2a2d879979 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,32 +1,47 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }: +, intltool, x11, libxklavier, libgcrypt +, qt4 ? null, qt5 ? null +}: let - ver_branch = "1.8"; - version = "1.8.6"; + ver_branch = "1.13"; + version = "1.13.1"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "17ivc0c4dbnc0fzd581j53cn6hdav34zz2hswjzy8aczbpk605qi"; + sha256 = "0xa23maq6phkfil8xx26viig2m99sbzcf1w7s56hns2qw6pycn79"; }; - patches = [ ./lightdm.patch ]; - patchFlags = "-p1"; - buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt - ] ++ stdenv.lib.optional doCheck dbus.daemon; + qt4 qt5 + ]; - configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ]; + configureFlags = [ + "--enable-liblightdm-gobject" + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" + ++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5"; - doCheck = false; # some tests fail, don't know why + installFlags = [ "DESTDIR=\${out}" ]; - meta = { + # Correct for the nested nix folder tree + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + + meta = with stdenv.lib; { homepage = http://launchpad.net/lightdm; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/lightdm.patch b/pkgs/applications/display-managers/lightdm/lightdm.patch deleted file mode 100644 index d81e0aae56d..00000000000 --- a/pkgs/applications/display-managers/lightdm/lightdm.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c -index 9387118..635cea0 100644 ---- a/liblightdm-gobject/greeter.c -+++ b/liblightdm-gobject/greeter.c -@@ -567,6 +567,21 @@ lightdm_greeter_get_default_session_hint (LightDMGreeter *greeter) - } - - /** -+ * lightdm_greeter_get_config_path -+ * @greeter: A #LightDMGreeter -+ * -+ * Get the config path to LightDM. -+ * -+ * Return value: The path to the current LightDM configuration file. -+ **/ -+const gchar * -+lightdm_greeter_get_config_path (LightDMGreeter *greeter) -+{ -+ g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL); -+ return lightdm_greeter_get_hint (greeter, "config-path"); -+} -+ -+/** - * lightdm_greeter_get_hide_users_hint: - * @greeter: A #LightDMGreeter - * -diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h -index 7d8988f..2b54909 100644 ---- a/liblightdm-gobject/lightdm/greeter.h -+++ b/liblightdm-gobject/lightdm/greeter.h -@@ -93,6 +93,8 @@ gboolean lightdm_greeter_get_select_guest_hint (LightDMGreeter *greeter); - - const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter); - -+const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter); -+ - gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter); - - gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter); -diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h -index 13ddcd9..cdb2fd6 100644 ---- a/liblightdm-gobject/lightdm/session.h -+++ b/liblightdm-gobject/lightdm/session.h -@@ -12,6 +12,7 @@ - #define LIGHTDM_SESSION_H_ - - #include -+#include "greeter.h" - - G_BEGIN_DECLS - -@@ -42,9 +43,9 @@ typedef struct - - GType lightdm_session_get_type (void); - --GList *lightdm_get_sessions (void); -+GList *lightdm_get_sessions (LightDMGreeter *greeter); - --GList *lightdm_get_remote_sessions (void); -+GList *lightdm_get_remote_sessions (LightDMGreeter *greeter); - - const gchar *lightdm_session_get_key (LightDMSession *session); - -diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c -index 949778f..db5e18a 100644 ---- a/liblightdm-gobject/session.c -+++ b/liblightdm-gobject/session.c -@@ -11,6 +11,7 @@ - #include - #include - -+#include "lightdm/greeter.h" - #include "lightdm/session.h" - - enum { -@@ -189,7 +190,7 @@ load_sessions (const gchar *sessions_dir) - } - - static void --update_sessions (void) -+update_sessions (LightDMGreeter *greeter) - { - GKeyFile *config_key_file = NULL; - gchar *config_path = NULL; -@@ -205,8 +206,7 @@ update_sessions (void) - remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR); - - /* Use session directory from configuration */ -- /* FIXME: This should be sent in the greeter connection */ -- config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); -+ config_path = g_strdup (lightdm_greeter_get_config_path (greeter)); - config_key_file = g_key_file_new (); - result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error); - if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) -@@ -250,9 +250,9 @@ update_sessions (void) - * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession - **/ - GList * --lightdm_get_sessions (void) -+lightdm_get_sessions (LightDMGreeter *greeter) - { -- update_sessions (); -+ update_sessions (greeter); - return local_sessions; - } - -@@ -264,9 +264,9 @@ lightdm_get_sessions (void) - * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession - **/ - GList * --lightdm_get_remote_sessions (void) -+lightdm_get_remote_sessions (LightDMGreeter *greeter) - { -- update_sessions (); -+ update_sessions (greeter); - return remote_sessions; - } - -diff --git a/src/lightdm.c b/src/lightdm.c -index 7d35034..910164c 100644 ---- a/src/lightdm.c -+++ b/src/lightdm.c -@@ -1142,6 +1142,9 @@ main (int argc, char **argv) - } - } - g_clear_error (&error); -+ -+ config_set_string (config_get_instance (), "SeatDefaults", "config-path", config_path); -+ - g_free (config_path); - - /* Set default values */ -diff --git a/src/seat.c b/src/seat.c -index e2b9c2c..a950ea2 100644 ---- a/src/seat.c -+++ b/src/seat.c -@@ -1137,6 +1137,7 @@ create_greeter_session (Seat *seat) - greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false"); - greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false"); - greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false"); -+ greeter_set_hint (greeter_session, "config-path", seat_get_string_property (seat, "config-path")); - - g_object_unref (session_config); - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3f3fb9a8c..361d58f6b92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11459,7 +11459,12 @@ let dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; - lightdm = callPackage ../applications/display-managers/lightdm { }; + lightdm = callPackage ../applications/display-managers/lightdm { + qt4 = null; + qt5 = null; + }; + + lightdm_qt = lightdm.override { qt5 = qt5; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; From 66bfdf6eb00c8def644fcd534e979db470a33b55 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 17:59:21 -0700 Subject: [PATCH 168/174] nixos/lightdm: We now use a global lightdm.conf --- nixos/modules/services/x11/display-managers/lightdm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 6cccb37a474..508fd665885 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -97,10 +97,12 @@ in # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH execCmd = '' export PATH=${lightdm}/sbin:$PATH - exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} + exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run ''; }; + environment.etc."lightdm/lightdm.conf".source = lightdmConf; + services.dbus.enable = true; services.dbus.packages = [ lightdm ]; From 4940e643ccdbaa224cd06a588bd5608e03c29dcf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 18:04:40 -0700 Subject: [PATCH 169/174] nixos/display-manager: Support configurable hidden users --- nixos/modules/services/misc/nix-daemon.nix | 6 +++++- .../services/x11/display-managers/default.nix | 8 ++++++++ nixos/modules/services/x11/display-managers/kdm.nix | 2 +- .../services/x11/display-managers/lightdm.nix | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index f231998d8f4..2da84c031a7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -20,6 +20,8 @@ let extraGroups = [ "nixbld" ]; }; + nixbldUsers = map makeNixBuildUser (range 1 cfg.nrBuildUsers); + nixConf = let # If we're using a chroot for builds, then provide /bin/sh in @@ -357,7 +359,9 @@ in nix.nrBuildUsers = mkDefault (lib.max 10 cfg.maxJobs); - users.extraUsers = map makeNixBuildUser (range 1 cfg.nrBuildUsers); + users.extraUsers = nixbldUsers; + + services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; system.activationScripts.nix = stringAfter [ "etc" "users" ] '' diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index ea45dabd125..c5012dbb5e3 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -208,6 +208,14 @@ in description = "Shell commands executed just before the window or desktop manager is started."; }; + hiddenUsers = mkOption { + type = types.listOf types.str; + default = [ "nobody" ]; + description = '' + A list of users which will not be shown in the display manager. + ''; + }; + desktopManagerHandlesLidAndPower = mkOption { type = types.bool; default = true; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 42eaacfe84a..d0b69c5452c 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -38,7 +38,7 @@ let ''} [X-*-Greeter] - HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10 + HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so ${optionalString (cfg.themeDirectory != null) '' diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 508fd665885..47d94dbe73b 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -50,6 +50,16 @@ let ''; }; + hiddenUsers = config.services.xserver.displayManager.hiddenUsers; + + usersConf = writeText "users.conf" + '' + [UserList] + minimum-uid=500 + hidden-users=${concatStringsSep " " hiddenUsers} + hidden-shells=/run/current-system/sw/sbin/nologin + ''; + lightdmConf = writeText "lightdm.conf" '' [LightDM] @@ -84,6 +94,7 @@ in package = wrappedGtkGreeter; }; }; + }; }; @@ -102,6 +113,7 @@ in }; environment.etc."lightdm/lightdm.conf".source = lightdmConf; + environment.etc."lightdm/users.conf".source = usersConf; services.dbus.enable = true; services.dbus.packages = [ lightdm ]; From fdd2b23c3e9e7699b893d3172cbc21b2c57dfb76 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 18:34:00 -0700 Subject: [PATCH 170/174] hicolor-icon-theme: 0.13 -> 0.14 --- pkgs/data/icons/hicolor-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index f8eb7bc032e..a0c9920177d 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.13"; + name = "hicolor-icon-theme-0.14"; src = fetchurl { - url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3"; + url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1k9fj0lb9b44inb5q5m04910x5nfkzrxl3ys9ckihqrixzk0dvbv"; }; setupHook = ./setup-hook.sh; From 29a343656b837a0ef23f95443185e2be5ed2d851 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Mar 2015 18:42:39 -0700 Subject: [PATCH 171/174] lightdm-gtk-greeter: More fixes --- .../display-managers/lightdm-gtk-greeter/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 3ad367dc058..176888328a5 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc"; }; - buildInputs = [ pkgconfig lightdm intltool ] - ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] + ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ "--localstatedir=/var" @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - '' + stdenv.lib.optionalString useGTK2 '' wrapProgram "$out/sbin/lightdm-gtk-greeter" \ --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ''; From 9e5abbc404f9087ae29e0df4cabdc1552e569cba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 10 Mar 2015 04:58:45 +0100 Subject: [PATCH 172/174] vim-plugins: wakatime 3.0.7 -> 3.0.8 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e3aae966996..6378ffdafe3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -487,11 +487,11 @@ rec { }; wakatime = buildVimPlugin { - name = "wakatime-3.0.7"; + name = "wakatime-3.0.8"; src = fetchFromGitHub { - sha256 = "1kn50fz9hnimzic640blmb5wi64vkcn45g15i4ckfzivza4jyc73"; - rev = "30ce2e30670d80ec1ef033ae4415c1f6ea46f18f"; + sha256 = "0sb3vgwnn8x1g50qlcimhw0rnkiw26rmk1d3j2a5bipx69xcl9pb"; + rev = "d6816d3766b31dd247a68023b04913b4a15fe565"; repo = "vim-wakatime"; owner = "wakatime"; }; From ed75d612d6d6cf1b2e75360eb52ae6aa79b24c69 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 25 Feb 2015 23:00:52 -0600 Subject: [PATCH 173/174] nixpkgs: afl 1.49b -> 1.56b Signed-off-by: Austin Seipp --- pkgs/tools/security/afl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 5bf9754775a..dd2bcd7b61e 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.49b"; + version = "1.56b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "14mbfdg78p80517zirvcsc2l2fbxn7n3j9zyfq8cn9dr2qi9icpq"; + sha256 = "1nagd9ycj0i1h7kx2pz07fpwy4b528inmc9hj7226qiid0bynsh4"; }; buildPhase = "make PREFIX=$out"; From 8ca89f9383108fff34da18c10022de28370e7cf8 Mon Sep 17 00:00:00 2001 From: Richard Zetterberg Date: Tue, 10 Mar 2015 10:49:46 +0100 Subject: [PATCH 174/174] django: Adds pypyPackages.django_1_7 (1.7.6) --- 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 c5eba265d32..c959f74538f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3901,6 +3901,24 @@ let django = self.django_1_6; + django_1_7 = buildPythonPackage rec { + name = "Django-${version}"; + version = "1.7.6"; + + src = pkgs.fetchurl { + url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; + sha256 = "142cim55wnv5q0zg039rankwah1gbpq46dgmp9yg78jrzq7mxwdh"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + django_1_6 = buildPythonPackage rec { name = "Django-${version}"; version = "1.6.6";